From 8fb5d40c37040204c49376df3de1295c0dd9ccd0 Mon Sep 17 00:00:00 2001 From: jebbs Date: Tue, 18 Oct 2022 09:29:49 +0800 Subject: [PATCH] remove yaml, toml from docs --- docs/configuration/index.md | 4 ++-- docs/configuration/index.zh.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/configuration/index.md b/docs/configuration/index.md index 1334419d..5dac98fe 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -42,12 +42,12 @@ $ sing-box format -w > You can skip this section if you are using only one configuration file. -sing-box supports multiple files and multiple formats. The latter overwrites and merges into the former, in the order in which the configuration files are loaded. +sing-box supports multiple configuration files. The latter overwrites and merges into the former, in the order in which the configuration files are loaded. ```bash # Load by the order of parameters -sing-box run -c inbound.json -c outbound.yaml -c -c http://url.to/config.toml +sing-box run -c inbound.json -c outbound.json # Load by the order of file names sing-box run -r -c config_dir ``` diff --git a/docs/configuration/index.zh.md b/docs/configuration/index.zh.md index 9a49ae74..68afa264 100644 --- a/docs/configuration/index.zh.md +++ b/docs/configuration/index.zh.md @@ -1,6 +1,6 @@ # 引言 -sing-box 支持 JSON、JSONC、YAML、TOML 作为配置文件格式。 +sing-box 使用 JSON 作为配置文件格式。 ### 结构 @@ -42,11 +42,11 @@ $ sing-box format -w > 如果只使用单个配置文件,您完全可以忽略这一节。 -sing-box 支持多文件、多格式混合使用。按照配置文件的加载顺序,后者会覆盖并合并到前者。 +sing-box 支持多文件配置。按照配置文件的加载顺序,后者会覆盖并合并到前者。 ```bash # 根据参数顺序加载 -sing-box run -c inbound.json -c outbound.yaml -c http://url.to/config.toml +sing-box run -c inbound.json -c outbound.json # 根据文件名顺序加载 sing-box run -r -c config_dir ```