Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
xishang0128 committed Nov 27, 2024
1 parent 41db398 commit 483728e
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 21 deletions.
6 changes: 6 additions & 0 deletions docs/config/dns/type.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
- https://doh.pub/dns-query
```

## DNS over HTTP/3

```{.yaml linenums="1"}
- h3://dns.alidns.com/dns-query
```

## DNS over QUIC

```{.yaml linenums="1"}
Expand Down
4 changes: 2 additions & 2 deletions docs/config/proxy-groups/index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ Excludes nodes that meet keywords or [regular expressions](https://github.com/zi

## exclude-type

Excludes node types.
Regular expressions are not supported. Split by `|`, exclude based on node type, only excluding [ingress outbound proxies](#proxies)

Note that the syntax for `proxy-groups` and `proxy-providers` is different; regular expressions are not supported, and should be separated by `|`.
For supported types, please refer to [Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45)

## expected-status

Expand Down
4 changes: 2 additions & 2 deletions docs/config/proxy-groups/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ proxy-groups:

## exclude-type

排除节点类型
不支持正则表达式,通过 `|` 分割,根据节点类型排除,仅排除[引入出站代理](#proxies)

注意,`proxy-groups``proxy-providers` 写法不同,不支持正则表达式,通过 `|` 分隔
支持类型请参阅[Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45)

## expected-status

Expand Down
9 changes: 7 additions & 2 deletions docs/config/proxy-providers/index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ proxy-providers:
path: ./proxy_providers/provider1.yaml
interval: 3600
proxy: DIRECT
size-limit: 0
header:
User-Agent:
- "Clash/v1.18.0"
Expand Down Expand Up @@ -77,6 +78,10 @@ The update time for the `provider`, measured in seconds.

Download/update through the specified proxy.

## size-limit

The maximum size of downloadable files is restricted, with the default being 0, which means no size limit; the unit is bytes (`b`)

## Header

Custom HTTP request headers.
Expand Down Expand Up @@ -135,7 +140,7 @@ Add a fixed suffix to the node name.

Replace the content of the node name, supporting regular expressions, where pattern is the replacement content and target is the replacement target.

### Configuration Items
### override.Configuration_items

Refer to common fields [tfo](../proxies/index.md#tfo)

Expand Down Expand Up @@ -171,4 +176,4 @@ Exclude nodes that meet keywords or [regular expressions](https://github.com/zii

Regular expressions are not supported; use `|` to separate and exclude based on node type.

Note that the syntax for `proxy-groups` and `proxy-providers` is different.
The `exclude-type` of the provider uses the `type` from the configuration file for exclusion
9 changes: 7 additions & 2 deletions docs/config/proxy-providers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ proxy-providers:
path: ./proxy_providers/provider1.yaml
interval: 3600
proxy: DIRECT
size-limit: 0
header:
User-Agent:
- "Clash/v1.18.0"
Expand Down Expand Up @@ -77,6 +78,10 @@ proxy-providers:

经过指定代理进行下载/更新

## size-limit

限制下载文件的最大大小,默认为 0 即不限制文件大小,单位为字节 (`b`)

## header

自定义 http 请求头
Expand Down Expand Up @@ -135,7 +140,7 @@ proxy-providers:

对节点名称内容进行替换,支持正则表达式,pattern 为替换内容,target 为替换目标

### 配置项
### override.其余配置项

参阅通用字段 [tfo](../proxies/index.md#tfo)

Expand Down Expand Up @@ -171,4 +176,4 @@ proxy-providers:

不支持正则表达式,通过 `|` 分割,根据节点类型排除

注意,`proxy-groups``proxy-providers` 写法不同
provider 的 `exclude-type` 使用配置文件中的 `type` 类型进行排除
7 changes: 6 additions & 1 deletion docs/config/rule-providers/index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rule-providers:
proxy: DIRECT
behavior: classical
format: yaml
size-limit: 0
```

## name
Expand Down Expand Up @@ -46,4 +47,8 @@ Behavior, options are `domain` / `ipcidr` / `classical`, corresponding to differ

Format, options are `yaml` / `text` / `mrs`, default is `yaml`.

Currently, `mrs` behavior only supports `domain` / `ipcidr`. You can convert using `mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`.
Currently, `mrs` behavior only supports `domain` / `ipcidr`. You can convert using `mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`.

## size-limit

The maximum size of downloadable files is restricted, with the default being 0, which means no size limit; the unit is bytes (`b`)
5 changes: 5 additions & 0 deletions docs/config/rule-providers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rule-providers:
proxy: DIRECT
behavior: classical
format: yaml
size-limit: 0
```

## name
Expand Down Expand Up @@ -47,3 +48,7 @@ rule-providers:
格式,可选 `yaml`/`text`/`mrs`,默认 `yaml`

`mrs`目前 `behavior` 仅支持 `domain`/`ipcidr`,可以通过`mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`转换得到

## size-limit

限制下载文件的最大大小,默认为 0 即不限制文件大小,单位为字节 (`b`)
12 changes: 6 additions & 6 deletions docs/startup/client/client.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# 第三方工具
# 三方工具/客户端

## Windows

|项目名称 | 维护状态 |
|:----|:----|
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |
|[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 |
|[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 |
|[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 |
Expand All @@ -13,30 +14,29 @@
|[clashtui](https://github.com/JohanChane/clashtui)|维护中 |
|[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 |
|[FlClash](https://github.com/chen08209/FlClash)|维护中 |
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |

## MacOS

|项目名称 | 维护状态 |
|:----|:----|
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |
|[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 |
|[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 |
|[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 |
|[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 |
|[FlClash](https://github.com/chen08209/FlClash)|维护中 |
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |

## Linux

|项目名称 | 维护状态 |
|:----|:----|
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |
|[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 |
|[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 |
|[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 |
|[clashtui](https://github.com/JohanChane/clashtui)|维护中 |
|[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 |
|[FlClash](https://github.com/chen08209/FlClash)|维护中 |
|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 |

## Android

Expand All @@ -54,8 +54,8 @@

|项目名称 | 维护状态 |
|:----|:----|
|[OpenClash](https://github.com/vernesong/OpenClash)|维护中|
|[OpenWrt-mihomo](https://github.com/morytyann/OpenWrt-mihomo)|维护中|
|[OpenClash](https://github.com/vernesong/OpenClash)|维护中 |
|[OpenWrt-mihomo](https://github.com/morytyann/OpenWrt-mihomo)|维护中 |
|[openwrt-fchomo](https://github.com/muink/openwrt-fchomo)|维护中|

## Shell
Expand Down
12 changes: 6 additions & 6 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ plugins:
web面板: Web dashboard
客户端: Client
创建运行服务: Create a running service
第三方工具: Third-party tools
三方工具/客户端: Third-party tools/client
常见问题: common problem

完整示例: Complete example
Expand All @@ -133,8 +133,8 @@ plugins:
代理集合: Proxy-Providers
代理集合配置: proxy-providers configuration
代理集合内容: proxy-providers contents
策略组: Proxy-Groups
策略组配置: proxy-groups configuration
代理组: Proxy-Groups
代理组配置: proxy-groups configuration
手动选择: Select
自动选择: Url-Test
自动回退: Fallback
Expand All @@ -160,7 +160,7 @@ nav:
- web面板: startup/web.md

- 创建运行服务: startup/service/index.md
- 第三方工具: startup/client/client.md
- 三方工具/客户端: startup/client/client.md
- 手册:
- handbook/index.md
- 语法: handbook/syntax.md
Expand Down Expand Up @@ -215,8 +215,8 @@ nav:
- 代理集合:
- 代理集合配置: config/proxy-providers/index.md
- 代理集合内容: config/proxy-providers/content.md
- 策略组:
- 策略组配置: config/proxy-groups/index.md
- 代理组:
- 代理组配置: config/proxy-groups/index.md
- 手动选择: config/proxy-groups/select.md
- 自动选择: config/proxy-groups/url-test.md
- 自动回退: config/proxy-groups/fallback.md
Expand Down

0 comments on commit 483728e

Please sign in to comment.