diff --git a/docs/changelog.md b/docs/changelog.md index ae52afa48..e10135f57 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2058,7 +2058,7 @@ See [Migration](/migration/#process_path-format-update-on-windows). The new DNS feature allows you to more precisely bypass Chinese websites via **DNS leaks**. Do not use plain local DNS if using this method. -See [Address Filter Fields](/configuration/dns/rule#address-filter-fields). +See [Legacy Address Filter Fields](/configuration/dns/rule#legacy-address-filter-fields). [Client example](/manual/proxy/client#traffic-bypass-usage-for-chinese-users) updated. @@ -2072,7 +2072,7 @@ the [Client example](/manual/proxy/client#traffic-bypass-usage-for-chinese-users **5**: The new feature allows you to cache the check results of -[Address filter DNS rule items](/configuration/dns/rule/#address-filter-fields) until expiration. +[Legacy Address Filter Fields](/configuration/dns/rule/#legacy-address-filter-fields) until expiration. **6**: @@ -2253,7 +2253,7 @@ See [TUN](/configuration/inbound/tun) inbound. **1**: The new feature allows you to cache the check results of -[Address filter DNS rule items](/configuration/dns/rule/#address-filter-fields) until expiration. +[Legacy Address Filter Fields](/configuration/dns/rule/#legacy-address-filter-fields) until expiration. #### 1.9.0-alpha.7 @@ -2300,7 +2300,7 @@ See [Migration](/migration/#process_path-format-update-on-windows). The new DNS feature allows you to more precisely bypass Chinese websites via **DNS leaks**. Do not use plain local DNS if using this method. -See [Address Filter Fields](/configuration/dns/rule#address-filter-fields). +See [Legacy Address Filter Fields](/configuration/dns/rule#legacy-address-filter-fields). [Client example](/manual/proxy/client#traffic-bypass-usage-for-chinese-users) updated. diff --git a/docs/configuration/dns/rule.md b/docs/configuration/dns/rule.md index 190192df4..64bfc7711 100644 --- a/docs/configuration/dns/rule.md +++ b/docs/configuration/dns/rule.md @@ -546,11 +546,11 @@ See [DNS Rule Actions](../rule_action/) for details. Moved to [DNS Rule Action](../rule_action#route). -### Address Filter Fields +### Legacy Address Filter Fields !!! failure "Deprecated in sing-box 1.14.0" - Address Filter Fields are deprecated and will be removed in sing-box 1.16.0, + Legacy Address Filter Fields are deprecated and will be removed in sing-box 1.16.0, check [Migration](/migration/#migrate-address-filter-fields-to-response-matching). Only takes effect for address requests (A/AAAA/HTTPS). When the query results do not match the address filtering rule items, the current rule will be skipped. @@ -577,7 +577,7 @@ Match GeoIP with query response. Match IP CIDR with query response. -As an Address Filter Field, deprecated. Use with `match_response` instead, +As a Legacy Address Filter Field, deprecated. Use with `match_response` instead, check [Migration](/migration/#migrate-address-filter-fields-to-response-matching). #### ip_is_private @@ -586,7 +586,7 @@ check [Migration](/migration/#migrate-address-filter-fields-to-response-matching Match private IP with query response. -As an Address Filter Field, deprecated. Use with `match_response` instead, +As a Legacy Address Filter Field, deprecated. Use with `match_response` instead, check [Migration](/migration/#migrate-address-filter-fields-to-response-matching). #### rule_set_ip_cidr_accept_empty @@ -611,7 +611,7 @@ Make `ip_cidr` rules in rule-sets accept empty query response. Match any IP with query response. -### Response Fields +### Response Match Fields !!! question "Since sing-box 1.14.0" diff --git a/docs/configuration/dns/rule.zh.md b/docs/configuration/dns/rule.zh.md index fb215b0c0..02e613145 100644 --- a/docs/configuration/dns/rule.zh.md +++ b/docs/configuration/dns/rule.zh.md @@ -544,11 +544,11 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. 已移动到 [DNS 规则动作](../rule_action#route). -### 地址筛选字段 +### 旧版地址筛选字段 !!! failure "已在 sing-box 1.14.0 废弃" - 地址筛选字段已废弃,且将在 sing-box 1.16.0 中被移除, + 旧版地址筛选字段已废弃,且将在 sing-box 1.16.0 中被移除, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 仅对地址请求 (A/AAAA/HTTPS) 生效。 当查询结果与地址筛选规则项不匹配时,将跳过当前规则。 @@ -576,7 +576,7 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. 与查询响应匹配 IP CIDR。 -作为地址筛选字段已废弃。请改为配合 `match_response` 使用, +作为旧版地址筛选字段已废弃。请改为配合 `match_response` 使用, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 #### ip_is_private @@ -585,7 +585,7 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. 与查询响应匹配非公开 IP。 -作为地址筛选字段已废弃。请改为配合 `match_response` 使用, +作为旧版地址筛选字段已废弃。请改为配合 `match_response` 使用, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 #### rule_set_ip_cidr_accept_empty @@ -610,7 +610,7 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. 匹配任意 IP。 -### 响应字段 +### 响应匹配字段 !!! question "自 sing-box 1.14.0 起" diff --git a/docs/configuration/experimental/cache-file.md b/docs/configuration/experimental/cache-file.md index 4ad0361c8..f91ee50fd 100644 --- a/docs/configuration/experimental/cache-file.md +++ b/docs/configuration/experimental/cache-file.md @@ -44,7 +44,7 @@ Store fakeip in the cache file Store rejected DNS response cache in the cache file -The check results of [Address filter DNS rule items](/configuration/dns/rule/#address-filter-fields) +The check results of [Legacy Address Filter Fields](/configuration/dns/rule/#legacy-address-filter-fields) will be cached until expiration. #### rdrc_timeout diff --git a/docs/configuration/experimental/cache-file.zh.md b/docs/configuration/experimental/cache-file.zh.md index 309e13a1e..a998aa773 100644 --- a/docs/configuration/experimental/cache-file.zh.md +++ b/docs/configuration/experimental/cache-file.zh.md @@ -42,7 +42,7 @@ 将拒绝的 DNS 响应缓存存储在缓存文件中。 -[地址筛选 DNS 规则项](/zh/configuration/dns/rule/#地址筛选字段) 的检查结果将被缓存至过期。 +[旧版地址筛选字段](/zh/configuration/dns/rule/#旧版地址筛选字段) 的检查结果将被缓存至过期。 #### rdrc_timeout diff --git a/docs/deprecated.md b/docs/deprecated.md index f1a0b91c9..7a2c5f4e7 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -14,31 +14,31 @@ check [Migration](../migration/#migrate-inline-acme-to-certificate-provider). Old fields will be removed in sing-box 1.16.0. -#### `strategy` in DNS rule actions +#### Legacy `strategy` DNS rule action option -`strategy` in DNS rule actions is deprecated, +Legacy `strategy` DNS rule action option is deprecated, check [Migration](../migration/#migrate-dns-rule-action-strategy-to-rule-items). Old fields will be removed in sing-box 1.16.0. -#### `ip_accept_any` in DNS rules +#### Legacy `ip_accept_any` DNS rule item -`ip_accept_any` in DNS rules is deprecated, +Legacy `ip_accept_any` DNS rule item is deprecated, check [Migration](../migration/#migrate-address-filter-fields-to-response-matching). Old fields will be removed in sing-box 1.16.0. -#### `rule_set_ip_cidr_accept_empty` in DNS rules +#### Legacy `rule_set_ip_cidr_accept_empty` DNS rule item -`rule_set_ip_cidr_accept_empty` in DNS rules is deprecated, +Legacy `rule_set_ip_cidr_accept_empty` DNS rule item is deprecated, check [Migration](../migration/#migrate-address-filter-fields-to-response-matching). Old fields will be removed in sing-box 1.16.0. -#### Address Filter Fields in DNS rules +#### Legacy Address Filter Fields in DNS rules -Address Filter Fields (`ip_cidr`, `ip_is_private` without `match_response`) -are deprecated, +Legacy Address Filter Fields (`ip_cidr`, `ip_is_private` without `match_response`) +in DNS rules are deprecated, check [Migration](../migration/#migrate-address-filter-fields-to-response-matching). Old behavior will be removed in sing-box 1.16.0. diff --git a/docs/deprecated.zh.md b/docs/deprecated.zh.md index 47ce260ee..f98b0c010 100644 --- a/docs/deprecated.zh.md +++ b/docs/deprecated.zh.md @@ -14,30 +14,30 @@ TLS 中的内联 ACME 选项(`tls.acme`)已废弃, 旧字段将在 sing-box 1.16.0 中被移除。 -#### DNS 规则动作中的 `strategy` +#### 旧版 DNS 规则动作 `strategy` 选项 -DNS 规则动作中的 `strategy` 已废弃, +旧版 DNS 规则动作 `strategy` 选项已废弃, 参阅[迁移指南](/zh/migration/#迁移-dns-规则动作-strategy-到规则项)。 旧字段将在 sing-box 1.16.0 中被移除。 -#### DNS 规则中的 `ip_accept_any` +#### 旧版 `ip_accept_any` DNS 规则项 -DNS 规则中的 `ip_accept_any` 已废弃, +旧版 `ip_accept_any` DNS 规则项已废弃, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 旧字段将在 sing-box 1.16.0 中被移除。 -#### DNS 规则中的 `rule_set_ip_cidr_accept_empty` +#### 旧版 `rule_set_ip_cidr_accept_empty` DNS 规则项 -DNS 规则中的 `rule_set_ip_cidr_accept_empty` 已废弃, +旧版 `rule_set_ip_cidr_accept_empty` DNS 规则项已废弃, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 旧字段将在 sing-box 1.16.0 中被移除。 -#### 地址筛选 DNS 规则项 +#### 旧版地址筛选字段 (DNS 规则) -地址筛选 DNS 规则项(不使用 `match_response` 的 `ip_cidr`、`ip_is_private`)已废弃, +旧版地址筛选字段(不使用 `match_response` 的 `ip_cidr`、`ip_is_private`)已废弃, 参阅[迁移指南](/zh/migration/#迁移地址筛选字段到响应匹配)。 旧行为将在 sing-box 1.16.0 中被移除。 diff --git a/docs/migration.md b/docs/migration.md index 956668dc8..91e771bab 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -81,7 +81,7 @@ See [ACME](/configuration/shared/certificate-provider/acme/) for fields newly ad ### Migrate DNS rule action strategy to rule items -`strategy` in DNS rule actions is deprecated. +Legacy `strategy` DNS rule action option is deprecated. In sing-box 1.14.0, internal domain resolution (Lookup) now splits A and AAAA queries at the rule level, so each query type is evaluated independently through the full rule chain. @@ -128,8 +128,8 @@ Use `ip_version` or `query_type` rule items to control which query types a rule ### Migrate address filter fields to response matching -Address Filter Fields (`ip_cidr`, `ip_is_private` without `match_response`) are deprecated, -along with `ip_accept_any` and `rule_set_ip_cidr_accept_empty`. +Legacy Address Filter Fields (`ip_cidr`, `ip_is_private` without `match_response`) in DNS rules are deprecated, +along with Legacy `ip_accept_any` and Legacy `rule_set_ip_cidr_accept_empty` DNS rule items. In sing-box 1.14.0, use the [`evaluate`](/configuration/dns/rule_action/#evaluate) action to fetch a DNS response, then match against it explicitly with `match_response`. diff --git a/docs/migration.zh.md b/docs/migration.zh.md index 121bd0679..3f1274055 100644 --- a/docs/migration.zh.md +++ b/docs/migration.zh.md @@ -81,7 +81,7 @@ sing-box 1.14.0 新增字段参阅 [ACME](/zh/configuration/shared/certificate-p ### 迁移 DNS 规则动作 strategy 到规则项 -DNS 规则动作中的 `strategy` 已废弃。 +旧版 DNS 规则动作 `strategy` 选项已废弃。 在 sing-box 1.14.0 中,内部域名解析(Lookup)现在在规则层拆分 A 和 AAAA 查询, 每种查询类型独立通过完整的规则链评估。 @@ -128,8 +128,8 @@ DNS 规则动作中的 `strategy` 已废弃。 ### 迁移地址筛选字段到响应匹配 -地址筛选字段(不使用 `match_response` 的 `ip_cidr`、`ip_is_private`)已废弃, -`ip_accept_any` 和 `rule_set_ip_cidr_accept_empty` 也已废弃。 +旧版地址筛选字段(不使用 `match_response` 的 `ip_cidr`、`ip_is_private`)已废弃, +旧版 `ip_accept_any` 和旧版 `rule_set_ip_cidr_accept_empty` DNS 规则项也已废弃。 在 sing-box 1.14.0 中,请使用 [`evaluate`](/zh/configuration/dns/rule_action/#evaluate) 动作 获取 DNS 响应,然后通过 `match_response` 显式匹配。 diff --git a/experimental/deprecated/constants.go b/experimental/deprecated/constants.go index 16e487ff6..543a10bb6 100644 --- a/experimental/deprecated/constants.go +++ b/experimental/deprecated/constants.go @@ -95,7 +95,7 @@ var OptionInlineACME = Note{ var OptionIPAcceptAny = Note{ Name: "dns-rule-ip-accept-any", - Description: "`ip_accept_any` in DNS rules", + Description: "Legacy `ip_accept_any` DNS rule item", DeprecatedVersion: "1.14.0", ScheduledVersion: "1.16.0", EnvName: "DNS_RULE_IP_ACCEPT_ANY", @@ -104,7 +104,7 @@ var OptionIPAcceptAny = Note{ var OptionRuleSetIPCIDRAcceptEmpty = Note{ Name: "dns-rule-rule-set-ip-cidr-accept-empty", - Description: "`rule_set_ip_cidr_accept_empty` in DNS rules", + Description: "Legacy `rule_set_ip_cidr_accept_empty` DNS rule item", DeprecatedVersion: "1.14.0", ScheduledVersion: "1.16.0", EnvName: "DNS_RULE_RULE_SET_IP_CIDR_ACCEPT_EMPTY", @@ -113,7 +113,7 @@ var OptionRuleSetIPCIDRAcceptEmpty = Note{ var OptionLegacyDNSAddressFilter = Note{ Name: "legacy-dns-address-filter", - Description: "Address Filter Fields in DNS rules", + Description: "Legacy Address Filter Fields in DNS rules", DeprecatedVersion: "1.14.0", ScheduledVersion: "1.16.0", EnvName: "LEGACY_DNS_ADDRESS_FILTER", @@ -122,7 +122,7 @@ var OptionLegacyDNSAddressFilter = Note{ var OptionLegacyDNSRuleStrategy = Note{ Name: "legacy-dns-rule-strategy", - Description: "`strategy` in DNS rule actions", + Description: "Legacy `strategy` DNS rule action option", DeprecatedVersion: "1.14.0", ScheduledVersion: "1.16.0", EnvName: "LEGACY_DNS_RULE_STRATEGY",