From 06399ddd6393caede0abf85f49495807c9636027 Mon Sep 17 00:00:00 2001
From: Luffy <lufei@php.net>
Date: Sat, 25 Jan 2025 08:47:22 +0800
Subject: [PATCH] Sync mbstring and network functions (#963)

---
 .../functions/mb-decode-numericentity.xml     |  5 ++--
 .../mbstring/functions/mb-http-input.xml      |  5 ++--
 .../mbstring/functions/mb-http-output.xml     |  2 +-
 .../network/functions/dns-get-record.xml      | 24 ++++---------------
 reference/network/functions/long2ip.xml       | 10 ++++++--
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/reference/mbstring/functions/mb-decode-numericentity.xml b/reference/mbstring/functions/mb-decode-numericentity.xml
index 58a378058..b68dba30f 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: 5dd2d0f74e31b4fed751ea3bbed7b4a6b0469228 Maintainer: daijie Status: ready -->
+<!-- EN-Revision: d553fa36940639b0889ec4358fa3bbb92f123b69 Maintainer: daijie Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.mb-decode-numericentity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -88,7 +88,8 @@
       <entry>8.4.0</entry>
       <entry>
        如果 <parameter>map</parameter> 不是 &integer;s 的列表，
-       <function>mb_decode_numericentity</function> 现在抛出 <exceptionname>ValueError</exceptionname>。
+       <function>mb_decode_numericentity</function> 现在抛出
+       <exceptionname>ValueError</exceptionname>。
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
diff --git a/reference/mbstring/functions/mb-http-input.xml b/reference/mbstring/functions/mb-http-input.xml
index 63a617d5b..41b406d14 100644
--- a/reference/mbstring/functions/mb-http-input.xml
+++ b/reference/mbstring/functions/mb-http-input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 5dd2d0f74e31b4fed751ea3bbed7b4a6b0469228 Maintainer: daijie Status: ready -->
+<!-- EN-Revision: d553fa36940639b0889ec4358fa3bbb92f123b69 Maintainer: daijie Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.mb-http-input" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -68,7 +68,8 @@
      <row>
       <entry>8.4.0</entry>
       <entry>
-       如果 <parameter>type</parameter> 无效，<function>mb_http_input</function> 现在抛出 <exceptionname>ValueError</exceptionname>。
+       如果 <parameter>type</parameter> 无效，<function>mb_http_input</function>
+       现在抛出 <exceptionname>ValueError</exceptionname>。
       </entry>
      </row>
      <row>
diff --git a/reference/mbstring/functions/mb-http-output.xml b/reference/mbstring/functions/mb-http-output.xml
index 6b16d1188..c32ecca06 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: 5dd2d0f74e31b4fed751ea3bbed7b4a6b0469228 Maintainer: daijie Status: ready -->
+<!-- EN-Revision: d553fa36940639b0889ec4358fa3bbb92f123b69 Maintainer: daijie Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.mb-http-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
diff --git a/reference/network/functions/dns-get-record.xml b/reference/network/functions/dns-get-record.xml
index cb98d8eb9..ca7737ef6 100644
--- a/reference/network/functions/dns-get-record.xml
+++ b/reference/network/functions/dns-get-record.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 7be2426e49ee1c9131866f20b67a48aaea0a642a Maintainer: zhoumengkang Status: ready -->
+<!-- EN-Revision: 35ca7f1087870c6023ef7a3dd0248501741c8194 Maintainer: zhoumengkang Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.dns-get-record" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -48,23 +48,9 @@
      <listitem>
       <para>
        默认情况下，<function>dns_get_record</function> 将会搜索跟 <parameter>hostname</parameter>
-       关联的任何资源记录。要限制查询，可以指定可选的 <parameter>type</parameter>
-       选项。可以是以下之一：<constant>DNS_A</constant>、<constant>DNS_CNAME</constant>、<constant>DNS_HINFO</constant>, <constant>DNS_CAA</constant>、<constant>DNS_MX</constant>、<constant>DNS_NS</constant>、<constant>DNS_PTR</constant>、<constant>DNS_SOA</constant>、<constant>DNS_TXT</constant>、<constant>DNS_AAAA</constant>、<constant>DNS_SRV</constant>、<constant>DNS_NAPTR</constant>、<constant>DNS_A6</constant>、<constant>DNS_ALL</constant>
-       或 <constant>DNS_ANY</constant>。
+       关联的任何资源记录。
+       要限制查询，请使用以下之一的 <constant>DNS_<replaceable>*</replaceable></constant> 常量。
       </para>
-      <note>
-       <para>
-        因为不同平台间的 libresolv 存在性能差异，<constant>DNS_ANY</constant>
-        不会始终返回每条记录，较慢的 <constant>DNS_ALL</constant>
-        会更可靠的收集所有记录。
-       </para>
-      </note>
-      <note>
-       <para>
-        Windows：不支持 <constant>DNS_CAA</constant>。没有实现对
-        <constant>DNS_A6</constant> 的支持。
-       </para>
-      </note>
      </listitem>
     </varlistentry>
     <varlistentry>
@@ -87,7 +73,7 @@
      <term><parameter>raw</parameter></term>
      <listitem>
       <para>
-       <parameter>type</parameter> 将解释为原始 DNS 类型 ID（不能使用 <literal>DNS_*</literal>
+       <parameter>type</parameter> 将解释为原始 DNS 类型 ID（不能使用 <constant>DNS_<replaceable>*</replaceable></constant>
        常量）。返回值包含 <literal>data</literal> 键，需要手动解析。
       </para>
      </listitem>
@@ -141,7 +127,7 @@
   </para>
   <para>
    <table>
-    <title>根据“type”的不同，出现的关联数组的其它键</title>
+    <title>根据 <parameter>type</parameter> 的不同，出现的关联数组的其它键</title>
     <tgroup cols="2">
      <thead>
       <row>
diff --git a/reference/network/functions/long2ip.xml b/reference/network/functions/long2ip.xml
index cbc03b823..44cc41604 100644
--- a/reference/network/functions/long2ip.xml
+++ b/reference/network/functions/long2ip.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d715365c098db000eaf7dcd987ee6093f6e83091 Maintainer: daijie Status: ready -->
+<!-- EN-Revision: 2537e56cce341e1c14cf2f0e49e5378700f84897 Maintainer: daijie Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.long2ip" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   返回字符串的互联网 IP 地址，&return.falseforfailure;。
+   以 <type>string</type> 的形式返互联网 IP 地址。
   </para>
  </refsect1>
 
@@ -53,6 +53,12 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       返回类型从 <type class="union"><type>string</type><type>false</type></type> 改为 <type>string</type>。
+      </entry>
+     </row>
      <row>
       <entry>7.1.0</entry>
       <entry>