Skip to content

Commit a2aa2ac

Browse files
nekohasekainekohasekai
committed
documentation: Fixes
1 parent cdee827 commit a2aa2ac

12 files changed

Lines changed: 320 additions & 222 deletions

File tree

‎docs/configuration/dns/rule_action.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Tag of target server.
4444

4545
`strategy` is deprecated in sing-box 1.14.0 and will be removed in sing-box 1.16.0.
4646

47-
Set domain strategy for this query. Deprecated, check [Migration](/migration/#migrate-dns-rule-action-strategy-to-rule-items).
47+
Set domain strategy for this query.
4848

4949
One of `prefer_ipv4` `prefer_ipv6` `ipv4_only` `ipv6_only`.
5050

‎docs/configuration/dns/rule_action.zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ icon: material/new-box
4444

4545
`strategy` 已在 sing-box 1.14.0 废弃，且将在 sing-box 1.16.0 中被移除。
4646

47-
为此查询设置域名策略。已废弃，参阅[迁移指南](/zh/migration/#迁移-dns-规则动作-strategy-到规则项)。
47+
为此查询设置域名策略。
4848

4949
可选项：`prefer_ipv4` `prefer_ipv6` `ipv4_only` `ipv6_only`。
5050

‎docs/configuration/dns/server/hosts.md‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,55 @@ Example:
7373

7474
=== "Use hosts if available"
7575

76-
```json
77-
{
78-
"dns": {
79-
"servers": [
80-
{
81-
...
82-
},
83-
{
84-
"type": "hosts",
85-
"tag": "hosts"
76+
=== ":material-card-multiple: sing-box 1.14.0"
77+
78+
```json
79+
{
80+
"dns": {
81+
"servers": [
82+
{
83+
...
84+
},
85+
{
86+
"type": "hosts",
87+
"tag": "hosts"
88+
}
89+
],
90+
"rules": [
91+
{
92+
"action": "evaluate",
93+
"server": "hosts"
94+
},
95+
{
96+
"match_response": true,
97+
"ip_accept_any": true,
98+
"action": "respond"
99+
}
100+
]
86101
}
87-
],
88-
"rules": [
89-
{
90-
"ip_accept_any": true,
91-
"server": "hosts"
102+
}
103+
```
104+
105+
=== ":material-card-remove: sing-box < 1.14.0"
106+
107+
```json
108+
{
109+
"dns": {
110+
"servers": [
111+
{
112+
...
113+
},
114+
{
115+
"type": "hosts",
116+
"tag": "hosts"
117+
}
118+
],
119+
"rules": [
120+
{
121+
"ip_accept_any": true,
122+
"server": "hosts"
123+
}
124+
]
92125
}
93-
]
94-
}
95-
}
96-
```
126+
}
127+
```

‎docs/configuration/dns/server/hosts.zh.md‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,55 @@ hosts 文件路径列表。
7373

7474
=== "如果可用则使用 hosts"
7575

76-
```json
77-
{
78-
"dns": {
79-
"servers": [
80-
{
81-
...
82-
},
83-
{
84-
"type": "hosts",
85-
"tag": "hosts"
76+
=== ":material-card-multiple: sing-box 1.14.0"
77+
78+
```json
79+
{
80+
"dns": {
81+
"servers": [
82+
{
83+
...
84+
},
85+
{
86+
"type": "hosts",
87+
"tag": "hosts"
88+
}
89+
],
90+
"rules": [
91+
{
92+
"action": "evaluate",
93+
"server": "hosts"
94+
},
95+
{
96+
"match_response": true,
97+
"ip_accept_any": true,
98+
"action": "respond"
99+
}
100+
]
86101
}
87-
],
88-
"rules": [
89-
{
90-
"ip_accept_any": true,
91-
"server": "hosts"
102+
}
103+
```
104+
105+
=== ":material-card-remove: sing-box < 1.14.0"
106+
107+
```json
108+
{
109+
"dns": {
110+
"servers": [
111+
{
112+
...
113+
},
114+
{
115+
"type": "hosts",
116+
"tag": "hosts"
117+
}
118+
],
119+
"rules": [
120+
{
121+
"ip_accept_any": true,
122+
"server": "hosts"
123+
}
124+
]
92125
}
93-
]
94-
}
95-
}
96-
```
126+
}
127+
```

‎docs/configuration/dns/server/resolved.md‎

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,62 @@ If not enabled, `NXDOMAIN` will be returned for requests that do not match searc
4343

4444
=== "Split DNS only"
4545

46-
```json
47-
{
48-
"dns": {
49-
"servers": [
50-
{
51-
"type": "local",
52-
"tag": "local"
53-
},
54-
{
55-
"type": "resolved",
56-
"tag": "resolved",
57-
"service": "resolved"
46+
=== ":material-card-multiple: sing-box 1.14.0"
47+
48+
```json
49+
{
50+
"dns": {
51+
"servers": [
52+
{
53+
"type": "local",
54+
"tag": "local"
55+
},
56+
{
57+
"type": "resolved",
58+
"tag": "resolved",
59+
"service": "resolved"
60+
}
61+
],
62+
"rules": [
63+
{
64+
"action": "evaluate",
65+
"server": "resolved"
66+
},
67+
{
68+
"match_response": true,
69+
"ip_accept_any": true,
70+
"action": "respond"
71+
}
72+
]
5873
}
59-
],
60-
"rules": [
61-
{
62-
"ip_accept_any": true,
63-
"server": "resolved"
74+
}
75+
```
76+
77+
=== ":material-card-remove: sing-box < 1.14.0"
78+
79+
```json
80+
{
81+
"dns": {
82+
"servers": [
83+
{
84+
"type": "local",
85+
"tag": "local"
86+
},
87+
{
88+
"type": "resolved",
89+
"tag": "resolved",
90+
"service": "resolved"
91+
}
92+
],
93+
"rules": [
94+
{
95+
"ip_accept_any": true,
96+
"server": "resolved"
97+
}
98+
]
6499
}
65-
]
66-
}
67-
}
68-
```
100+
}
101+
```
69102

70103
=== "Use as global DNS"
71104

‎docs/configuration/dns/server/resolved.zh.md‎

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,62 @@ icon: material/new-box
4242

4343
=== "仅分割 DNS"
4444

45-
```json
46-
{
47-
"dns": {
48-
"servers": [
49-
{
50-
"type": "local",
51-
"tag": "local"
52-
},
53-
{
54-
"type": "resolved",
55-
"tag": "resolved",
56-
"service": "resolved"
45+
=== ":material-card-multiple: sing-box 1.14.0"
46+
47+
```json
48+
{
49+
"dns": {
50+
"servers": [
51+
{
52+
"type": "local",
53+
"tag": "local"
54+
},
55+
{
56+
"type": "resolved",
57+
"tag": "resolved",
58+
"service": "resolved"
59+
}
60+
],
61+
"rules": [
62+
{
63+
"action": "evaluate",
64+
"server": "resolved"
65+
},
66+
{
67+
"match_response": true,
68+
"ip_accept_any": true,
69+
"action": "respond"
70+
}
71+
]
5772
}
58-
],
59-
"rules": [
60-
{
61-
"ip_accept_any": true,
62-
"server": "resolved"
73+
}
74+
```
75+
76+
=== ":material-card-remove: sing-box < 1.14.0"
77+
78+
```json
79+
{
80+
"dns": {
81+
"servers": [
82+
{
83+
"type": "local",
84+
"tag": "local"
85+
},
86+
{
87+
"type": "resolved",
88+
"tag": "resolved",
89+
"service": "resolved"
90+
}
91+
],
92+
"rules": [
93+
{
94+
"ip_accept_any": true,
95+
"server": "resolved"
96+
}
97+
]
6398
}
64-
]
65-
}
66-
}
67-
```
99+
}
100+
```
68101

69102
=== "用作全局 DNS"
70103

0 commit comments

Comments
 (0)