From 39d6a3e1ae884af901e856f7682233143fb5fe5f Mon Sep 17 00:00:00 2001 From: qukun Date: Wed, 19 May 2021 15:45:54 +0800 Subject: [PATCH 1/2] fix word "namespae" -> "namespace" --- PULL_REQUEST_TEMPLATE.md | 8 ++++---- .../src/main/asciidoc-zh/nacos-config.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 7261357c..2286f057 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,15 +1,15 @@ ### Describe what this PR does / why we need it - +fix words that we can read more friendly ### Does this pull request fix one issue? - +no ### Describe how you did it - +when I read wiki-document, I find it ### Describe how to verify it - +By google translate ### Special notes for reviews diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc index 4f7de312..0332d68c 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc @@ -260,7 +260,7 @@ Nacos 内部有 https://nacos.io/zh-cn/docs/concepts.html[Namespace 的概念]: [quote] 用于进行租户粒度的配置隔离。不同的命名空间下,可以存在相同的 Group 或 Data ID 的配置。Namespace 的常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等。 -在没有明确指定 `${spring.cloud.nacos.config.namespace}` 配置的情况下, 默认使用的是 Nacos 上 Public 这个namespae。如果需要使用自定义的命名空间,可以通过以下配置来实现: +在没有明确指定 `${spring.cloud.nacos.config.namespace}` 配置的情况下, 默认使用的是 Nacos 上 Public 这个namespace。如果需要使用自定义的命名空间,可以通过以下配置来实现: [source,properties] ---- spring.cloud.nacos.config.namespace=b3404bc0-d7dc-4855-b519-570ed34b62d7 From 0612c9c7266d41ff6de670581486215691a94ef4 Mon Sep 17 00:00:00 2001 From: captainkun <44936259+captainkun@users.noreply.github.com> Date: Wed, 19 May 2021 16:38:18 +0800 Subject: [PATCH 2/2] Update PULL_REQUEST_TEMPLATE.md rollback --- PULL_REQUEST_TEMPLATE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 2286f057..7261357c 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,15 +1,15 @@ ### Describe what this PR does / why we need it -fix words that we can read more friendly + ### Does this pull request fix one issue? -no + ### Describe how you did it -when I read wiki-document, I find it + ### Describe how to verify it -By google translate + ### Special notes for reviews