You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by yi...@apache.org on 2022/03/30 01:30:12 UTC
[apisix-website] branch master updated: docs: Style guide for APISIX documentation (#974)
This is an automated email from the ASF dual-hosted git repository.
yilinzeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 6024443 docs: Style guide for APISIX documentation (#974)
6024443 is described below
commit 60244433b27b8374dd8485d809e91bc848f1de3a
Author: Navendu Pottekkat <na...@gmail.com>
AuthorDate: Wed Mar 30 07:00:05 2022 +0530
docs: Style guide for APISIX documentation (#974)
---
README.md | 2 +-
.../blog/2021/06/28/why-we-need-Apache-APISIX.md | 2 +-
website/blog/2021/08/30/Ingress-Meeting.md | 2 +-
.../13/celebrating-300-contributors-of-apisix.md | 2 +-
.../2021/12/01/apisix-supports-azure-functions.md | 2 +-
website/blog/2021/12/22/google-logging.md | 2 +-
.../12/24/apisix-integrate-openwhisk-plugin.md | 2 +-
website/blog/2021/12/24/open-policy-agent.md | 2 +-
website/blog/2022/01/04/authing.md | 2 +-
.../blog/2022/01/17/apisix-kafka-integration.md | 2 +-
.../2022/01/20/upyun-public-gateway-usecase.md | 2 +-
.../01/21/apisix-hashicorp-vault-integration.md | 2 +-
.../01/21/apisix-xrpc-details-and-miltilingual.md | 2 +-
.../blog/2022/01/25/apisix-grpc-web-integration.md | 2 +-
.../01/26/apisix-integrate-forward-auth-plugin.md | 2 +-
.../blog/2022/02/10/splunk-apisix-integration.md | 2 +-
website/blog/2022/02/16/file-logger-api-gateway.md | 2 +-
website/blog/2022/02/21/nacos-api-gateway.md | 2 +-
website/blog/2022/02/23/csrf-api-gateway.md | 2 +-
website/blog/2022/02/25/consul-api-gateway.md | 2 +-
.../03/01/apisix-integration-public-api-plugin.md | 2 +-
.../03/02/apisix-integration-graphql-plugin.md | 2 +-
...apisix-uses-coredns-enable-service-discovery.md | 2 +-
.../apisix-integration-eureka-service-discovery.md | 2 +-
website/config/navbar.js | 8 +-
website/docs/general/2fa.md | 30 -----
website/docs/general/blog-contributing-guide.md | 12 +-
website/docs/general/committer-guide.md | 30 +----
website/docs/general/community.md | 31 -----
website/docs/general/contributor-guide.md | 69 ++++++-----
website/docs/general/documentation-guide.md | 126 +++++++++++++++++++++
.../docs/general/integrate-with-project-docs.md | 88 --------------
website/docs/general/join.md | 36 ++++++
website/docs/general/release-guide.md | 20 ++--
website/docs/general/security-guide.md | 6 +-
website/docs/general/sidebars.json | 31 +++--
website/docs/general/submit-issue.md | 28 +++++
website/docs/general/subscribe-guide.md | 23 ----
website/docusaurus.config.js | 4 +-
.../2021/08/30/Ingress-Meeting.md | 2 +-
.../13/celebrating-300-contributors-of-apisix.md | 2 +-
.../2021/12/01/apisix-supports-azure-functions.md | 2 +-
.../2021/12/22/google-logging.md | 2 +-
.../12/24/apisix-integrate-openwhisk-plugin.md | 2 +-
.../2021/12/24/open-policy-agent.md | 2 +-
.../2022/01/04/authing.md | 2 +-
.../2022/01/17/apisix-kafka-integration.md | 2 +-
.../2022/01/20/upyun-public-gateway-usecase.md | 2 +-
.../01/21/apisix-hashicorp-vault-integration.md | 2 +-
.../01/21/apisix-xrpc-details-and-miltilingual.md | 2 +-
.../2022/01/25/apisix-grpc-web-integration.md | 2 +-
.../01/26/apisix-integrate-forward-auth-plugin.md | 2 +-
.../2022/02/10/splunk-apisix-integration.md | 2 +-
.../2022/02/16/file-logger-api-gateway.md | 2 +-
.../2022/02/21/nacos-api-gateway.md | 2 +-
.../2022/02/23/csrf-api-gateway.md | 2 +-
.../2022/02/25/consul-api-gateway.md | 2 +-
.../28/apisix-integration-opentelemetry-plugin.md | 2 +-
.../03/01/apisix-integration-public-api-plugin.md | 2 +-
.../03/02/apisix-integration-graphql-plugin.md | 2 +-
...apisix-uses-coredns-enable-service-discovery.md | 2 +-
.../apisix-integration-eureka-service-discovery.md | 2 +-
website/src/pages/help.js | 2 +-
website/src/pages/sections/home-events-section.jsx | 2 +-
64 files changed, 328 insertions(+), 312 deletions(-)
diff --git a/README.md b/README.md
index 8f5d45c..82e678a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Apache APISIX® Website
-[<img align="right" width="150" src="./website/static/img/join-slack.png">](https://apisix.apache.org/docs/general/community)
+[<img align="right" width="150" src="./website/static/img/join-slack.png">](https://apisix.apache.org/docs/general/join)
The website of [Apache APISIX®](https://apisix.apache.org/), a cloud-native microservices api gateway.
diff --git a/website/blog/2021/06/28/why-we-need-Apache-APISIX.md b/website/blog/2021/06/28/why-we-need-Apache-APISIX.md
index 132978a..dab08f0 100644
--- a/website/blog/2021/06/28/why-we-need-Apache-APISIX.md
+++ b/website/blog/2021/06/28/why-we-need-Apache-APISIX.md
@@ -173,6 +173,6 @@ Unification itself is not the goal, but the benefits after unification is the lo
- Company value: Unify technology stack, reduce company operation cost, reduce the difficulty of transitioning to microservices and cloud-native, and accelerate enterprise digital transformation.
-Last but not least is the APISIX [Slack channel](https://apisix.apache.org/docs/general/community#slack), any questions can be left here or on [Github issue](https://github.com/apache/apisix/issues), there will be someone to respond quickly, thanks again.
+Last but not least is the APISIX [Slack channel](https://apisix.apache.org/docs/general/join#join-the-slack-channel), any questions can be left here or on [Github issue](https://github.com/apache/apisix/issues), there will be someone to respond quickly, thanks again.
Click to watch the [video](https://www.bilibili.com/video/BV1w54y1V73Z?p=1&share_medium=android&share_plat=android&share_source=COPY&share_tag=s_i×tamp=1621812452&unique_k=PEusrt)
diff --git a/website/blog/2021/08/30/Ingress-Meeting.md b/website/blog/2021/08/30/Ingress-Meeting.md
index a2d5102..6b74c4d 100644
--- a/website/blog/2021/08/30/Ingress-Meeting.md
+++ b/website/blog/2021/08/30/Ingress-Meeting.md
@@ -41,7 +41,7 @@ We welcome you to join us to discuss the Apache APISIX Ingress solution, and we
If you are interested in the technical direction of Apache APISIX, want to develop it together, or have other suggestions or comments, you can participate through the following channels: 1.
1. subscribe and send an email to dev@apisix.apache.org
-Participate in the community the Apache Way way by subscribing to the [Subscription Guide](https://apisix.apache.org/docs/general/subscribe-guide). The mailing list is the most common way for the Apache community to communicate, and the community will actively respond to questions on the mailing list.
+Participate in the community the Apache Way way by subscribing to the [Subscription Guide](https://apisix.apache.org/docs/general/join). The mailing list is the most common way for the Apache community to communicate, and the community will actively respond to questions on the mailing list.
2. Start a discussion in the Apache APISIX Github discussion
The [discussion](https://github.com/apache/apisix/discussions) area is very active. From time to time, we'll also include a summary of frequently asked questions in the discussion to make them easier to find.
diff --git a/website/blog/2021/10/13/celebrating-300-contributors-of-apisix.md b/website/blog/2021/10/13/celebrating-300-contributors-of-apisix.md
index 3883ca1..4ef8cd9 100644
--- a/website/blog/2021/10/13/celebrating-300-contributors-of-apisix.md
+++ b/website/blog/2021/10/13/celebrating-300-contributors-of-apisix.md
@@ -48,6 +48,6 @@ Past recommendations.
- [Apache APISIX Community Weekly Report ｜ 2021 8.23-8.29](https://apisix.apache.org/zh/blog/2021/08/30/weekly-report)
- [Apache APISIX Community Weekly Report ｜ 2021 8.16-8.22](https://apisix.apache.org/zh/blog/2021/08/23/weekly-report)
-What kind of events do you want the Apache APISIX community to organize? Or want to be an organizer/volunteer for an event, feel free to discuss it on the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide)!
+What kind of events do you want the Apache APISIX community to organize? Or want to be an organizer/volunteer for an event, feel free to discuss it on the [mailing list](https://apisix.apache.org/zh/docs/general/join)!
Apache APISIX community is thankful to have you, and we are looking forward to more people joining the Apache APISIX community. The Apache APISIX community is grateful to have you.
diff --git a/website/blog/2021/12/01/apisix-supports-azure-functions.md b/website/blog/2021/12/01/apisix-supports-azure-functions.md
index 5bbff15..942914a 100644
--- a/website/blog/2021/12/01/apisix-supports-azure-functions.md
+++ b/website/blog/2021/12/01/apisix-supports-azure-functions.md
@@ -181,4 +181,4 @@ curl http://127.0.0.1:9080/apisix/admin/plugin_metadata/azure-functions \
## Summary
-The `azure-functions` plugin is Apache APISIX's second plugin designed for serverless. We are developing other serverless plugins and will feature them with the upcoming Apache APISIX releases. If you are interested, please don't hesitate to [file an issue](https://github.com/apache/apisix/issues/new/choose) to share your opinions. You can talk about your proposals of developing a new plugin in our [mailing list](https://apisix.apache.org/docs/general/community) as well!
+The `azure-functions` plugin is Apache APISIX's second plugin designed for serverless. We are developing other serverless plugins and will feature them with the upcoming Apache APISIX releases. If you are interested, please don't hesitate to [file an issue](https://github.com/apache/apisix/issues/new/choose) to share your opinions. You can talk about your proposals for developing a new plugin in our [mailing list](https://apisix.apache.org/docs/general/join) as well!
diff --git a/website/blog/2021/12/22/google-logging.md b/website/blog/2021/12/22/google-logging.md
index 9bb044a..32d0aac 100644
--- a/website/blog/2021/12/22/google-logging.md
+++ b/website/blog/2021/12/22/google-logging.md
@@ -199,7 +199,7 @@ This article describes the detailed steps for interfacing Apache APISIX and Goog
Apache APISIX is not only committed to maintaining its own high performance, but also has always attached great importance to the construction of open source ecology. At present, Apache APISIX has 10+ logging-related plugins and supports interfacing with mainstream open source logging projects in the industry.
-If you have a need to interface to other logs, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to the Apache APISIX [mailing list](https://apisix.apache.org/docs/general/subscribe-guide/) and express your thoughts via email.
+If you have a need to interface to other logs, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to the Apache APISIX [mailing list](https://apisix.apache.org/docs/general/join/) and express your thoughts via email.
## Related articles
diff --git a/website/blog/2021/12/24/apisix-integrate-openwhisk-plugin.md b/website/blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
index 3d7223b..181619c 100644
--- a/website/blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
+++ b/website/blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
@@ -184,4 +184,4 @@ Thanks to the dynamic advantage of Apache APISIX, the process of turning on and
In this article, we have introduced the feature preview and usage steps of `openwhisk` plugin. For more information about `openwhisk` plugin description and full configuration list, please refer to the [official documentation](https://apisix.apache.org/docs/apisix/next/plugins/openwhisk).
-Currently, we are also developing other Serverless plugins to integrate with more cloud services. If you're interested in such integration projects, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide/).
+Currently, we are also developing other Serverless plugins to integrate with more cloud services. If you're interested in such integration projects, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/docs/general/join/).
diff --git a/website/blog/2021/12/24/open-policy-agent.md b/website/blog/2021/12/24/open-policy-agent.md
index 1e615c1..1cdba0d 100644
--- a/website/blog/2021/12/24/open-policy-agent.md
+++ b/website/blog/2021/12/24/open-policy-agent.md
@@ -239,4 +239,4 @@ This article describes the detailed steps for interfacing Apache APISIX and Open
Apache APISIX is not only committed to maintaining its own high performance, but also has always attached great importance to the construction of open source ecology. At present, Apache APISIX has 10+ authentication authorization-related plug-ins that support interfacing with mainstream authentication authorization services in the industry.
-If you have the need to interface with other authentication authorities, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to Apache APISIX's [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to express your ideas via email.
+If you have the need to interface with other authentication authorities, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to Apache APISIX's [mailing list](https://apisix.apache.org/zh/docs/general/join) to express your ideas via email.
diff --git a/website/blog/2022/01/04/authing.md b/website/blog/2022/01/04/authing.md
index 155129b..3915ef5 100644
--- a/website/blog/2022/01/04/authing.md
+++ b/website/blog/2022/01/04/authing.md
@@ -252,4 +252,4 @@ This article describes the detailed steps for interfacing Apache APISIX with Aut
Apache APISIX is not only committed to maintaining its own high performance, but also has always attached great importance to the construction of open source ecology. At present, Apache APISIX has 10+ authentication authorization-related plug-ins that support interfacing with mainstream authentication authorization services in the industry.
-If you have a need to interface to other authentication authorities, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to Apache APISIX's [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to express your thoughts via email.
+If you have a need to interface to other authentication authorities, visit Apache APISIX's [GitHub](https://github.com/apache/apisix/issues) and leave your suggestions via issue; or subscribe to Apache APISIX's [mailing list](https://apisix.apache.org/zh/docs/general/join) to express your thoughts via email.
diff --git a/website/blog/2022/01/17/apisix-kafka-integration.md b/website/blog/2022/01/17/apisix-kafka-integration.md
index b45577a..273c63f 100644
--- a/website/blog/2022/01/17/apisix-kafka-integration.md
+++ b/website/blog/2022/01/17/apisix-kafka-integration.md
@@ -214,4 +214,4 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
In this article, we have introduced the feature preview and usage steps of the kafka-logger plugin. For more information about the kafka-logger plugin and the full configuration list, you can refer to the official documentation.
-We are also currently working on other logging plugins to integrate with more related services. If you're interested in such integration projects, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide).
+We are also currently working on other logging plugins to integrate with more related services. If you're interested in such integration projects, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/join).
diff --git a/website/blog/2022/01/20/upyun-public-gateway-usecase.md b/website/blog/2022/01/20/upyun-public-gateway-usecase.md
index 98c6c78..77d54c0 100644
--- a/website/blog/2022/01/20/upyun-public-gateway-usecase.md
+++ b/website/blog/2022/01/20/upyun-public-gateway-usecase.md
@@ -121,4 +121,4 @@ At the same time, the high scalability of open source also brings developers mor
We hope that this series of user cases will provide some ideas and directions for you in the process of gateway selection.We hope that this series of user cases will provide some ideas and directions for you in the gateway selection process.
-At the same time, Apache APISIX also welcomes users who are using APISIX to actively participate in sharing related user cases and practices, and feel free to start discussions in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide).
+At the same time, Apache APISIX also welcomes users who are using APISIX to actively participate in sharing related user cases and practices, and feel free to start discussions in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via [mailing list](https://apisix.apache.org/zh/docs/general/join).
diff --git a/website/blog/2022/01/21/apisix-hashicorp-vault-integration.md b/website/blog/2022/01/21/apisix-hashicorp-vault-integration.md
index fc6b186..1bf5bda 100644
--- a/website/blog/2022/01/21/apisix-hashicorp-vault-integration.md
+++ b/website/blog/2022/01/21/apisix-hashicorp-vault-integration.md
@@ -370,7 +370,7 @@ $ curl http://127.0.0.1:9080/apisix/admin/consumers -H 'X-API-KEY: edd1c9f034335
This article brings you the upcoming release of the Vault-Apache APISIX integration and related details.
-Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide).
+Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/docs/general/join).
## Reference
diff --git a/website/blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md b/website/blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
index c94c73b..56c4a57 100644
--- a/website/blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
+++ b/website/blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
@@ -138,4 +138,4 @@ This article brings you the upcoming release of the xRPC framework for Apache AP
The article also shows the details of Apache APISIX's multilanguage development support. It shows the ecology-oriented efforts of Apache APISIX from both the multiprotocol proxy and multilanguage support perspectives.
-Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide).
+Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/join).
diff --git a/website/blog/2022/01/25/apisix-grpc-web-integration.md b/website/blog/2022/01/25/apisix-grpc-web-integration.md
index 68b1d56..9de9eb3 100644
--- a/website/blog/2022/01/25/apisix-grpc-web-integration.md
+++ b/website/blog/2022/01/25/apisix-grpc-web-integration.md
@@ -303,4 +303,4 @@ Next, simply enable the `grpc-web` plugin in the Apache APISIX routing plugin co
This article brings you hands-on experience about using `grpc-web` in Apache APISIX.
-Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide).
+Feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/join).
diff --git a/website/blog/2022/01/26/apisix-integrate-forward-auth-plugin.md b/website/blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
index 4e28076..3ff8609 100644
--- a/website/blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
+++ b/website/blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
@@ -99,4 +99,4 @@ Thanks to the dynamic nature of Apache APISIX, there is no need to restart Apach
To get more information about the `forward-auth` plugin description and full configuration list, you can refer to the [official documentation](https://apisix.apache.org/docs/apisix/next/plugins/forward-auth). Also, if you have more complex authentication or authorization application scenarios, try using the `opa` plugin, which allows for more powerful functionality in a programmable way.
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list]( https://apisix.apache.org/zh/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list]( https://apisix.apache.org/zh/docs/general/join) to communicate.
diff --git a/website/blog/2022/02/10/splunk-apisix-integration.md b/website/blog/2022/02/10/splunk-apisix-integration.md
index 1be145a..0af25cf 100644
--- a/website/blog/2022/02/10/splunk-apisix-integration.md
+++ b/website/blog/2022/02/10/splunk-apisix-integration.md
@@ -183,7 +183,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
## Summary
-Apache APISIX is also currently working on additional plugins to support integration with more services, so if you're interested, feel free to start a discussion thread in our [GitHub Discussion](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide).
+Apache APISIX is also currently working on additional plugins to support integration with more services, so if you're interested, feel free to start a discussion thread in our [GitHub Discussion](https://github.com/apache/apisix/discussions) or communicate via the [mailing list](https://apisix.apache.org/zh/docs/general/join).
## Related articles
diff --git a/website/blog/2022/02/16/file-logger-api-gateway.md b/website/blog/2022/02/16/file-logger-api-gateway.md
index 20dd2d8..07463e1 100644
--- a/website/blog/2022/02/16/file-logger-api-gateway.md
+++ b/website/blog/2022/02/16/file-logger-api-gateway.md
@@ -351,7 +351,7 @@ This concludes the plugin addition test session.
The above is the whole process of implementing an Apache APISIX plugin from 0 as a newbie in the backend. I did encounter a lot of pitfalls in the process of developing the plugin, but luckily there are many enthusiastic brothers in the Apache APISIX community to help me solve the problems, which made the development and testing of the file-logger plugin relatively smooth throughout. If you are interested in this plugin, or want to see the details of the plugin, you can refer to the [off [...]
-Apache APISIX is also currently working on other plugins to support more integration services, so if you're interested, feel free to start a discussion in the [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide).
+Apache APISIX is also currently working on other plugins to support more integration services, so if you're interested, feel free to start a discussion in the [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/join).
## References
diff --git a/website/blog/2022/02/21/nacos-api-gateway.md b/website/blog/2022/02/21/nacos-api-gateway.md
index 077abba..77e80cb 100644
--- a/website/blog/2022/02/21/nacos-api-gateway.md
+++ b/website/blog/2022/02/21/nacos-api-gateway.md
@@ -195,4 +195,4 @@ This article introduces the concept of registry center and how Apache APISIX coo
To get more information about the `nacos` plugin description and full configuration list, you can refer to the [Apache APISIX's official documentation](https://apisix.apache.org/docs/apisix/discovery/nacos/).
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/join) to communicate.
diff --git a/website/blog/2022/02/23/csrf-api-gateway.md b/website/blog/2022/02/23/csrf-api-gateway.md
index 2f14130..b2880c9 100644
--- a/website/blog/2022/02/23/csrf-api-gateway.md
+++ b/website/blog/2022/02/23/csrf-api-gateway.md
@@ -147,4 +147,4 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
This article describes in detail how the `csrf` plugin works and how to use it. We hope that this article can give you a clearer understanding of using the plugin to intercept CSRF attacks in Apache APISIX and facilitate its application in practical scenarios.
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/join) to communicate.
diff --git a/website/blog/2022/02/25/consul-api-gateway.md b/website/blog/2022/02/25/consul-api-gateway.md
index 8443efa..ff18e03 100644
--- a/website/blog/2022/02/25/consul-api-gateway.md
+++ b/website/blog/2022/02/25/consul-api-gateway.md
@@ -252,4 +252,4 @@ The first half of this article describes how Apache APISIX works with Consul to
More instructions on using the Consul registry in Apache APISIX can be found in the [official documentation](https://apisix.apache.org/docs/apisix/discovery/consul_kv/).
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/join) to communicate.
diff --git a/website/blog/2022/03/01/apisix-integration-public-api-plugin.md b/website/blog/2022/03/01/apisix-integration-public-api-plugin.md
index 3421106..0f2110a 100644
--- a/website/blog/2022/03/01/apisix-integration-public-api-plugin.md
+++ b/website/blog/2022/03/01/apisix-integration-public-api-plugin.md
@@ -246,4 +246,4 @@ You should note that after `public-api` is included in the official version rele
To get more information about the `public-api` plugin description and full configuration list, you can refer to the [Apache APISIX official documentation](https://apisix.apache.org/docs/apisix/next/plugins/public-api).
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/join) to communicate.
diff --git a/website/blog/2022/03/02/apisix-integration-graphql-plugin.md b/website/blog/2022/03/02/apisix-integration-graphql-plugin.md
index f076b8e..dae8332 100644
--- a/website/blog/2022/03/02/apisix-integration-graphql-plugin.md
+++ b/website/blog/2022/03/02/apisix-integration-graphql-plugin.md
@@ -342,4 +342,4 @@ This article briefly introduces the application of GraphQL in Apache APISIX, and
For more instructions and complete configuration information about GraphQL, please refer to the [Apache APISIX official documentation](https://apisix.apache.org/docs/apisix/router-radixtree/#how-to-filter-route-by-graphql-attributes).
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/join) to communicate.
diff --git a/website/blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md b/website/blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
index c30923c..96cd42e 100644
--- a/website/blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
+++ b/website/blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
@@ -257,4 +257,4 @@ By verifying, we can find that the request has been redirected to the new addres
This article mainly introduces the types of service discovery and how to use CoreDNS in Apache APISIX. You can use Apache APISIX and CoreDNS according to your business needs and past technical architecture.
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussions](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/zh/docs/general/join) to communicate.
diff --git a/website/blog/2022/03/05/apisix-integration-eureka-service-discovery.md b/website/blog/2022/03/05/apisix-integration-eureka-service-discovery.md
index fd68277..f9fa061 100644
--- a/website/blog/2022/03/05/apisix-integration-eureka-service-discovery.md
+++ b/website/blog/2022/03/05/apisix-integration-eureka-service-discovery.md
@@ -263,4 +263,4 @@ Spring Cloud is a popular microservice framework, and Apache APISIX provides the
For more instructions and complete configuration information about the `eureka` plugin, please refer to the [Apache APISIX official documentation](https://apisix.apache.org/docs/apisix/discovery/eureka/).
-Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/subscribe-guide) to communicate.
+Apache APISIX is also currently working on additional plugins to support the integration of additional services, so if you are interested, feel free to start a discussion in [GitHub Discussion](https://github.com/apache/apisix/discussions), or via the [mailing list](https://apisix.apache.org/docs/general/join) to communicate.
diff --git a/website/config/navbar.js b/website/config/navbar.js
index f760827..cf4c220 100644
--- a/website/config/navbar.js
+++ b/website/config/navbar.js
@@ -38,7 +38,7 @@ module.exports = [
},
{
label: "General",
- to: "/docs/general/community",
+ to: "/docs/general/join",
},
],
},
@@ -75,16 +75,12 @@ module.exports = [
label: "Plugin Hub",
},
{
- to: "/docs/general/community",
+ to: "/docs/general/join",
label: "Community"
},
{
to: "/docs/general/events",
label: "Events"
- },
- {
- to: "/contribute",
- label: "Contribute"
}
]
},
diff --git a/website/docs/general/2fa.md b/website/docs/general/2fa.md
deleted file mode 100644
index 3eeaaaf..0000000
--- a/website/docs/general/2fa.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-id: 2fa
-title: Two Factor Authentication
-keywords:
-- API gateway
-- APISIX
-- Apache APISIX
-- Two Factor Authentication
-description: This article provides information on how to enable Two-Factor Authentication (2FA) on GitHub. It consists of 3 parts, what is Two-Factor Authentication (2FA), how to enable 2FA on GitHub, and how to submit code.
----
-
-## Two-Factor Authentication (2FA)
-
-Two-Factor Authentication (2FA) refers to the authentication method that combines both a password and an object (credit card, SMS, tokens, or biomarkers as fingerprint) to identify a user.
-
-To ensure the security of the committer’s account, we need you to [configure 2FA](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication) while signing in to contribute code on GitHub. For more details, please refer to [Securing your account with two-factor authentication (2FA)](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa).
-
-**Note**: If 2FA is not enabled, you are liable to be removed from the project and would not be able to access Apache APISIX's repositories.
-
-## Configuring 2FA on GitHub
-
-You can configure 2FA using a [mobile app](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-totp-mobile-app) or via [text message](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-text-messages).
-
-GitHub recommends using a time-based-one-time password (TOTP) mobile application to configure 2FA. Read [Configuring two-factor authentication](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication) for detailed information.
-
-## Submitting Code
-
-After enabling 2FA, [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) to perform Git operations.
-
-You can then use the username + personal access token combination in place of the username + password combination while pushing your code.
diff --git a/website/docs/general/blog-contributing-guide.md b/website/docs/general/blog-contributing-guide.md
index 4b17962..2396187 100644
--- a/website/docs/general/blog-contributing-guide.md
+++ b/website/docs/general/blog-contributing-guide.md
@@ -1,6 +1,6 @@
---
id: blog
-title: Blog Contributing Guide
+title: Contribute a blog post
keywords:
- API gateway
- APISIX
@@ -10,11 +10,9 @@ keywords:
description: This article contains guidelines for contributors who want to write/update blogs posts on the Apache APISIX website.
---
-## Overview
-
Please follow this guide while writing/updating [blog posts](/blog/) on the Apache APISIX website.
-Please [submit an issue](/docs/general/contributor-guide/#submitting-an-issue) if you find any issues in the published blog posts. Also feel free to [open a pull request](/docs/general/contributor-guide/#open-a-pull-request) to fix the issue yourself.
+Please [submit an issue](/docs/general/submit-issue) if you find any issues in the published blog posts. Also feel free to [open a pull request](/docs/general/contributor-guide/#open-a-pull-request) to fix the issue yourself.
The blogs are written in both [English](/blog/) and [Chinese](/zh/blog/). Contributors are encouraged to write blogs in their preferred language. Translations can be handled later and you can review the pull request.
@@ -24,7 +22,7 @@ For example, `website/blog/2021/11/22/develop-apisix-ingress-with-nocalhost-in-k
Similarly, Chinese blogs are located in `website/i18n/zh/docusaurus-plugin-content-blog` directory and follow the same patterns described above.
-## Areas to Contribute
+## Areas to contribute
You are encouraged to write blogs posts about how you use Apache APISIX or how you are contributing to Apache APISIX.
@@ -193,7 +191,3 @@ You can also make impactful contributions by fixing/updating the existing blog p
1. To start, locate the file for the blog post. Note that English blogs are located in the `website/blog` directory and the Chinese blogs are located in `website/i18n/zh/docusaurus-plugin-content-blog` directory.
2. Once you locate the file, make the necessary changes.
3. [Open a pull request](/docs/general/contributor-guide/#open-a-pull-request) with the updated blog post.
-
-## Contributing Guide
-
-Please make sure you follow the [Contributor Guide](/docs/general/contributor-guide/) while you contribute blog posts.
diff --git a/website/docs/general/committer-guide.md b/website/docs/general/committer-guide.md
index 43af648..bb228ff 100644
--- a/website/docs/general/committer-guide.md
+++ b/website/docs/general/committer-guide.md
@@ -1,6 +1,6 @@
---
id: committer-guide
-title: Committer Guide
+title: Project management structure
keywords:
- API gateway
- APISIX
@@ -9,31 +9,11 @@ keywords:
description: This article covers some guidelines for Apache APISIX committers. It walks through the type of contributions and the contributor ladder and how contributors can become committers and then PMC members.
---
-This article walks through the guidelines for Apache APISIX contributors.
+This document walks through how Apache APISIX contributors are structured.
-See [Contributor Guide](/docs/general/contributor-guide/) to learn more about the contributing process.
+See [Contributing flow](/docs/general/contributor-guide/) to learn more about the contributing process.
-## What Can I Contribute?
-
-Any and all forms of contributions are welcome! For example you can,
-
-- Fix issues tagged "[good first issue](/docs/general/contributor-guide/#good-first-issues)" or "[help wanted](https://github.com/apache/apisix/issues?q=is%3Aopen+label%3A%22help+wanted%22+sort%3Aupdated-desc)".
-
-- Join the discussions on the [mailing list](/docs/general/subscribe-guide/).
-
-- Answer questions in [issues](https://github.com/apache/apisix/issues) and [discussions](https://github.com/apache/apisix/discussions).
-
-- Review open [pull requests](https://github.com/apache/apisix/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc).
-
-- Improve the website.
-
-- Improve documentation or write a blog post.
-
-- Any other form of code or non-code contribution.
-
-If you would like to contribute, let us know by sending an email to dev@apisix.apache.org!
-
-## How to become an APISIX committer?
+## How do I become an Apache APISIX committer?
Anyone can be a contributor to an Apache project. Being a contributor means that you take an interest in the project and contribute to it in some way, ranging from asking sensible questions (which documents the project and provides feedback to developers) to working on new features and patches.
@@ -75,7 +55,7 @@ The following are the expected responsibilities of an ASF Committer.
8. Guide new contributors to join the community.
-## How to become an APISIX PMC?
+## How do I become an Apache APISIX PMC member?
In APISIX community, a committer who has earned even more merits can be invited to be a part of the Project Management Committee (PMC).
diff --git a/website/docs/general/community.md b/website/docs/general/community.md
deleted file mode 100644
index 63a3677..0000000
--- a/website/docs/general/community.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-id: community
-title: Community
-keywords:
- - Slack
- - Community
- - Apache APISIX
-description: This article provides useful information about Apache APISIX's Community, including 2 ways to join the Slack channel.
----
-
-
-Apache APISIX is a project maintained by community members under the Apache Software Foundation.
-It is an open-source project that abides by the [Apache Software Foundation's code of conduct](https://www.apache.org/foundation/policies/conduct.html). Apache APISIX is a dynamic, real-time, high-performance Cloud-Native API Gateway. It handles traditional north-south traffic, as well as east-west traffic between services.
-
-## How to Get Involved
-
-Apache APISIX is an open-source infrastructure software project that provides API processing and analytics with products and solutions for microservices and real-time traffic processing; such as API gateway, k8s ingress controller, and Service Mesh.
-
-Want to get involved with a project, join our Slack community, collaborate & interact with other community members who will make sure you are not left out. We are open to any form of contribution; like code contributions, design, community management, advocacy, or you can just listen in.
-
-### Joining the Mailing List
-
-The Apache APISIX project is built by the collaboration of the community and great contributors. Catch up on other activities in this community by [subscribing to the mailing list](https://apisix.apache.org/docs/general/subscribe-guide).
-
-### Joining the Slack Channel
-
-You can join the Apache APISIX Slack channel in two ways:
-
-- using [this invite](https://join.slack.com/t/the-asf/shared_invite/zt-vlfbf7ch-HkbNHiU_uDlcH_RvaHv9gQ) (_Please open an issue if this link is expired_).
-
-- By sending an email to the list ([dev@apisix.apache.org](mailto:dev@apisix.apache.org)) requesting help to join.
diff --git a/website/docs/general/contributor-guide.md b/website/docs/general/contributor-guide.md
index dd35fb7..d1e4ee2 100644
--- a/website/docs/general/contributor-guide.md
+++ b/website/docs/general/contributor-guide.md
@@ -1,33 +1,37 @@
---
id: contributor-guide
-title: Contributor Guide
+title: Contributing flow
keywords:
- API gateway
- APISIX
- Apache APISIX
- contributor guide
-description: This article is a set of guidelines for Apache APISIX contributors, including things that a contributor can do and how to do it well.
+description: Guidelines for Apache APISIX contributors.
---
-Please follow this guide to [report bugs](#submitting-an-issue), [submit suggestions](#submitting-an-issue), or [submit PRs](#open-a-pull-request).
+This document describes the general flow for contributing to APISIX repos.
-## Submitting an Issue
+## What can I contribute?
-Before submitting an issue, try solving the problem through a comprehensive search.
+Any and all forms of contributions are welcome! For example you can,
-[Open issues](https://github.com/apache/apisix/issues) and the [discussions forum](https://github.com/apache/apisix/discussions) are good places to search for solutions before opening an issue.
+- Fix issues tagged with "[good first issue](/docs/general/contributor-guide/#good-first-issues)" or "[help wanted](https://github.com/apache/apisix/issues?q=is%3Aopen+label%3A%22help+wanted%22+sort%3Aupdated-desc)" labels.
-1. Check the [open issues](https://github.com/apache/apisix/issues) to avoid duplication.
+- Join the discussions on the [mailing list](/docs/general/join/).
-2. Create a [new issue](https://github.com/apache/apisix/issues/new/choose) and choose the type of issue.
+- Answer questions in [issues](https://github.com/apache/apisix/issues) and [discussions](https://github.com/apache/apisix/discussions).
-3. Define the issue with a clear and descriptive title.
+- Review open [pull requests](https://github.com/apache/apisix/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc).
-4. Fill in necessary information according to the template.
+- Improve the website.
-5. Engage in the discussions in the issue and provide more information if necessary.
+- Improve documentation or write a blog post.
-## Choosing an Issue to Work On
+- Any other form of code or non-code contribution.
+
+If you would like to contribute, let us know by sending an email to dev@apisix.apache.org!
+
+## Choosing an issue to work on
You can also contribute by fixing one of the [open issues](https://github.com/apache/apisix/issues).
@@ -37,28 +41,19 @@ You can also contribute by fixing one of the [open issues](https://github.com/ap
3. Connect with a [Committer or PMC](/team) for providing feedback on your issue and reviewing your PR.
-### Good First Issues
+### Good first issues
-Issues labelled "good first issues" are low hanging fruits that are easy to fix. These issues can help you make your first contributions to Apache APISIX®.
+Issues labelled "good first issues" are low hanging fruits that are easy to fix. These issues can help you make your first contributions to APISIX.
-The list below contains such issues spanning across all the repos in Apache APISIX®.
+To start, you can go through this [curated list of "good first issues"](/contribute).
-- [Apache APISIX®](https://github.com/apache/apisix/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Apache APISIX® Ingress Controller](https://github.com/apache/apisix-ingress-controller/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Apache APISIX® dashboard](https://github.com/apache/apisix-dashboard/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Apache APISIX® Helm Chart](https://github.com/apache/apisix-helm-chart/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Docker distribution for Apache APISIX®](https://github.com/apache/apisix-docker/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Apache APISIX® Website](https://github.com/apache/apisix-website/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-- [Apache APISIX® Java Plugin Runner](https://github.com/apache/apisix-java-plugin-runner/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
-- [Apache APISIX® Go Plugin Runner](https://github.com/apache/apisix-go-plugin-runner/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
-
-## Git Flow
+## Git flow
To contribute code or documentation, setup your local machine for development.
### Fork the repo and clone your fork
-Fork the [Apache APISIX repo](https://github.com/apache/apisix/) and clone your fork to your local machine.
+Fork the [APISIX repo](https://github.com/apache/apisix/) and clone your fork to your local machine.
```sh
git clone https://github.com/your-username/apisix.git
@@ -134,4 +129,24 @@ See [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow#
5. Wait for your PR to be approved and merged.
-6. Congratulate yourself for being an official contributor of Apache APISIX®!
+6. Congratulate yourself for being an official contributor of Apache APISIX!
+
+## Two-Factor Authentication (2FA)
+
+Two-Factor Authentication (2FA) refers to the authentication method that combines both a password and an object (credit card, SMS, tokens, or biomarkers as fingerprint) to identify a user.
+
+To ensure the security of the committer’s account, we need you to [configure 2FA](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication) while signing in to contribute code on GitHub. For more details, please refer to [Securing your account with two-factor authentication (2FA)](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa).
+
+**Note**: If 2FA is not enabled, you are liable to be removed from the project and would not be able to access Apache APISIX's repositories.
+
+### Configuring 2FA on GitHub
+
+You can configure 2FA using a [mobile app](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-totp-mobile-app) or via [text message](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-text-messages).
+
+GitHub recommends using a time-based-one-time password (TOTP) mobile application to configure 2FA. Read [Configuring two-factor authentication](https://docs.github.com/en/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication) for detailed information.
+
+### Submitting code
+
+After enabling 2FA, [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) to perform Git operations.
+
+You can then use the username + personal access token combination in place of the username + password combination while pushing your code.
diff --git a/website/docs/general/documentation-guide.md b/website/docs/general/documentation-guide.md
new file mode 100644
index 0000000..85c1776
--- /dev/null
+++ b/website/docs/general/documentation-guide.md
@@ -0,0 +1,126 @@
+---
+id: documentation-style-guide
+title: Documentation style guide
+keywords:
+ - API gateway
+ - APISIX
+ - Apache APISIX
+ - project documentations
+description: Style guide for Apache APISIX documentation.
+---
+
+This document is a style guide for Apache APISIX documentation. This document is intended for contributors to APISIX's documentation and should be followed to ensure consistency.
+
+To learn more about contributing, see [Contributing flow](contributor-guide.md).
+
+## Tone, content and audience
+
+- Aim for a voice and tone that's conversational, friendly, and respectful without being frivolous. Learn more on [Voice and tone](https://developers.google.com/style/tone).
+- Write for accessibility. See [General do's and don'ts](https://developers.google.com/style/accessibility#general-dos-and-donts) to learn more.
+- Identify the intended audience and write for them. Find the common ground for you and your target audience.
+
+## Language
+
+- Use second person while writing unless it isn't appropriate.
+- Use active voice while writing.
+- Use standard American spellings.
+- Always place [conditional clauses before instructions](https://developers.google.com/style/clause-order).
+- Use the following spellings for project specific entities:
+ - Use Apache APISIX instead of APISIX when referencing the project in introductions and when referencing to the project community.
+ - Use APISIX instead when referencing to the project inside documentation.
+ - APISIX specific component names like Plugin and Route are always capitalized.
+ - Use correct acronyms when necessary. Use the expanded word in first usage and proceed to use the acronym in the rest of the references. For example:
+
+ | ✅ | ❌ |
+ | ---------------- | ---------------- |
+ | URL | url |
+ | API | api |
+ | APISIX Dashboard | Apisix dashboard |
+ | gRPC | GRPC/grpc |
+
+## Formatting, punctuation and organization
+
+- Use sentence case for all headings and subheadings.
+- Use advanced markdown features and admonitions provided by Docusaurus when necessary:
+ - Use [tabs](https://docusaurus.io/docs/next/markdown-features/tabs) and [synced tabs](https://docusaurus.io/docs/next/markdown-features/tabs#syncing-tab-choices) when you have to show multiple paths based on a user's configuration or environment.
+ - Use [code blocks](https://docusaurus.io/docs/next/markdown-features/code-blocks) to display code. Add the file being modified as the title of the codeblock (for example, `coonf/config.yaml`). Use line highlighting to focus the attention of the use while explaining code.
+ - Use [admonitions](https://docusaurus.io/docs/next/markdown-features/admonitions) to highlight important information. Use them as suggested below:
+ - Note: for general information you want to stand out.
+ - Tip: to give users bonus tips that build on top of the rest of the content. Can be ignored generally.
+ - Important: to give extra emphasis to general information.
+ - Warning: to highlight possibilities of loss of configuration or data.
+ - Danger: user should be very careful about what is mentioned in the block. Use only in cases of maximum severity.
+- Use tables to convey appropriate information easily. See [how they are used in FAQ](/docs/apisix/FAQ#what-is-the-difference-between-plugin-metadata-and-plugin-configs-in-apache-apisix).
+- Use relative paths within markdown files `../xxx/xxx` instead of absolute paths.
+
+### Directory structure
+
+The documents are organized as shown below. To create a new page, create a new file in the latest folder of the language you are writing the doc in.
+
+```text
+/docs
+├── assets
+│ ├── images
+│ │ ├── xxxxx.png
+│ └── other
+│ └── xxxxx.xxx
+├── en
+│ └── latest
+│ ├── doc1.md
+│ └── folder
+│ └── doc2.md
+│ └── folder2
+│ └── doc3.md
+│
+└── zh
+ └── latest
+ └── ...
+```
+
+### Configuration file
+
+The configuration file is located in `/docs/<locale>/latest/config.json` where locale represents the locale code (language). Refer to [Locale Codes](https://www.science.co.il/language/Locale-codes.php) for more info. Note that locale is always all lowercase.
+
+You can learn more about the sidebar from the [Docusaurus docs](https://v2.docusaurus.io/docs/next/sidebar).
+
+```jsonc
+{
+ "version": 2.3,
+ "sidebar": [
+ // The left sidebar of the APISIX website
+ {
+ "type": "doc",
+ "id": "doc2" // id is the filename of the md file
+ },
+ {
+ "type": "category", // category is a collapsed column, nestable
+ "label": "folder",
+ "items": [
+ {
+ "type": "doc",
+ "id": "folder/doc2"
+ },
+ {
+ "type": "category",
+ "label": "folder2",
+ "items": [
+ "folder2/doc3"
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "label": "CHANGELOG",
+ "href": "https://github.com/apache/apisix/blob/master/CHANGELOG"
+ }
+ ]
+}
+```
+
+## Images and embedded content
+
+- Use images of good quality such that the information presented is clearly visible to the reader.
+- The images are currently uploaded to a private CDN to ensure smaller repo size and fast loads. Please reach out to the project team to upload/change an image.
+- Use the default APISIX admin account while taking screenshots.
+- Provide meaningful file names and alt text for the images.
diff --git a/website/docs/general/integrate-with-project-docs.md b/website/docs/general/integrate-with-project-docs.md
deleted file mode 100644
index 769d563..0000000
--- a/website/docs/general/integrate-with-project-docs.md
+++ /dev/null
@@ -1,88 +0,0 @@
----
-id: integrate-with-project-docs
-title: Integrating Project Documentation
-keywords:
-- API gateway
-- APISIX
-- Apache APISIX
-- project documentations
-description: This article explains Apache APISIX documents' directory structure, the configuration file, and markdown formatting restrictions.
----
-
-## Directory Structure
-
-The docs are organized as shown below. To create a new page, create a new file in the latest folder of the language you are writing the doc in.
-
-```text
-/docs
-├── assets
-│ ├── images
-│ │ ├── xxxxx.png
-│ └── other
-│ └── xxxxx.xxx
-├── en
-│ └── latest
-│ ├── doc1.md
-│ ├── folder
-│ │ └── doc2.md
-│ │ └── folder2
-│ │ └── doc3.md
-│ └── config.json
-├── es
-│ └── latest
-│ └── ...
-└── zh
- └── latest
- └── ...
-```
-
-## Configuration File
-
-The configuration file is located in `/docs/<locale>/latest/config.json` where locale represents the locale code (language). Refer to [Locale Codes](https://www.science.co.il/language/Locale-codes.php) for more info. Note that locale is always all lowercase.
-
-You can learn more about the sidebar from the [Docusaurus docs](https://v2.docusaurus.io/docs/next/sidebar).
-
-```json
-{
- "version": 2.3,
- "sidebar": [
- // The left sidebar of the APISIX website
- {
- "type": "doc",
- "id": "doc2" // id is the filename of the md file
- },
- {
- "type": "category", // category is a collapsed column, nestable
- "label": "folder",
- "items": [
- {
- "type": "doc",
- "id": "folder/doc2"
- },
- {
- "type": "category",
- "label": "folder2",
- "items": [
- "folder2/doc3"
- ]
- }
- ]
- },
- {
- "type": "link",
- "label": "CHANGELOG",
- "href": "https://github.com/apache/apisix/blob/master/CHANGELOG"
- }
- ]
-}
-```
-
-## Markdown Formatting Guide
-
-Please follow this guide while working with markdown files.
-
-- Always use relative paths within markdown files `../xxx/xxx` and not absolute paths `/docs/en/xxx/xxx`. To refer files outside the docs directory, use the format `https://github.com/apache/apisix-xxx/blob/master/xxx/xxx.xxx`
-
-- Always use markdown syntax to include images (``). **Don't** use HTML tags as an alternative (`<img src=". /assets/xxxx.png" />`).
-
-- Make sure to close the HTML tags if the markdown file has any. For example, a `<br>` tag must be written as `<br/>`.
diff --git a/website/docs/general/join.md b/website/docs/general/join.md
new file mode 100644
index 0000000..3359802
--- /dev/null
+++ b/website/docs/general/join.md
@@ -0,0 +1,36 @@
+---
+id: join
+title: Join the conversation
+keywords:
+ - Apache APISIX
+ - Slack
+ - Community
+description: Join the Apache APISIX community and get involved in the conversations.
+---
+
+
+Apache APISIX is a project maintained by community members under the Apache Software Foundation and abide by [ASF's code of conduct](https://www.apache.org/foundation/policies/conduct.html).
+
+We have a transparent and inclusive community where you can join in and contribute to the discussion.
+
+## Subscribe to the Mailing List
+
+You can subscribe to the Apache APISIX mailing list to discuss issues, suggest new ideas, and participate in other community discussions.
+
+1. To subscribe to the mailing list, first, send an email to dev-subscribe@apisix.apache.org.
+
+2. Once you send the email, you will receive a confirmation e-mail from dev-help@apisix.apache.org.
+
+3. Reply to this email to confirm your subscription.
+
+4. Once you confirm, you will receive a welcome email with instructions on using and communicating over the mailing list.
+
+5. To view archived emails from the mailing list, check out the [history](https://lists.apache.org/list.html?apisix.apache.org).
+
+## Join the Slack Channel
+
+You can join the Apache APISIX Slack channel in two ways:
+
+- Using [this invite](https://join.slack.com/t/the-asf/shared_invite/zt-vlfbf7ch-HkbNHiU_uDlcH_RvaHv9gQ) (_Please [open an issue](./submit-issue.md) if this link is expired_).
+
+- By [subscribing to the mailing list](#subscribe-to-the-mailing-list) and sending an email to the list ([dev@apisix.apache.org](mailto:dev@apisix.apache.org)) requesting help to join.
diff --git a/website/docs/general/release-guide.md b/website/docs/general/release-guide.md
index bb95d81..c06526c 100644
--- a/website/docs/general/release-guide.md
+++ b/website/docs/general/release-guide.md
@@ -9,7 +9,7 @@ keywords:
description: This article explains Apache APISIX's release flow and GPG Settings.
---
-## Release Flow
+## Release flow
The release flow of Apache APISIX follows [GitLab flow](https://docs.gitlab.com/ee/topics/gitlab_flow.html), instead of Git flow or Github flow. Furthermore, [Release branches with GitLab flow](https://docs.gitlab.com/ee/topics/gitlab_flow.html#release-branches-with-gitlab-flow) is the preferred way. The chart below will take the release `v2.3` of [apache/apisix-dashboard](https://github.com/apache/apisix-dashboard) as an example to illustrate the details.
@@ -17,7 +17,7 @@ The release flow of Apache APISIX follows [GitLab flow](https://docs.gitlab.com/
The entire flow is comprised of the following four phases.
-### Planning Phase
+### Planning phase
This phase will decide if a feature is ready to be released as well as the release time.
@@ -25,14 +25,14 @@ This phase will decide if a feature is ready to be released as well as the relea
- A discussion will be started on dev mailing list dev@apisix.apache.org for gathering ideas for the next release.
- Maintainer team will then mark the issues and pull requests with the target milestone.
-### Development Phase
+### Development phase
This phase is for developing new features and fixing bugs.
- Maintainer team and contributors will work on the issues targeted to release milestone.
- Every single new issue is required to be recognized if it should be included in the next release. If yes, the milestone needs to be set for the issue.
-### Release Phase
+### Release phase
This phase will be throughout the entire Release Time Window.
@@ -42,11 +42,11 @@ This phase will be throughout the entire Release Time Window.
- At the end of the Release Time Window, the `CHANGELOG` for the new release will be added.
- Tag the last commit and release the assets via the following section [GPG Settings](#gpg-settings).
-### Maintenance Phase
+### Maintenance phase
Once a version is released, it will enter the maintenance mode and will only accept the security and critical bug patches backported from the `master` branch. A new version will be released soon after significant bugs got fixed, with patch version increment (e.g. `2.3.1`). In this case, all users are recommended to upgrade to the latest release to avoid potential risk to the stability.
-## GPG Settings
+## GPG settings
### Install GPG
@@ -58,7 +58,7 @@ After the installation is complete, execute the following command to check the v
$ gpg --version
```
-### Create Key
+### Create key
Execute the following command to create the key:
@@ -163,7 +163,7 @@ uid Yuansheng Wang <me...@apache.org>
sub 4096R/3D2F913D 2020-01-02
```
-### Login id.apache.org and submit Key Fingerprint
+### Login id.apache.org and submit key fingerprint
### Add your GPG key to Apache svn
@@ -332,6 +332,6 @@ Invite [PMCs](https://apisix.apache.org/team/) to move KEYS and package under th
The [Download](https://apisix.apache.org/downloads) page contains links for Apache APISIX, Apache APISIX Dashboard, and other sources, and we need to update its contents [here](https://github.com/apache/apisix-website/blob/master/website/docusaurus.config.js).
-### Send ANNOUNCE
+### Send announcement email
-Click [here](https://lists.apache.org/thread.html/r6e90ffb7964314605c082ac3ae204303ad94f0f71087542c33fcd7bf%40%3Cdev.apisix.apache.org%3E) to view the reference email send announce email to dev@apisix.apache.org and announce@apache.org
+Click [here](https://lists.apache.org/thread.html/r6e90ffb7964314605c082ac3ae204303ad94f0f71087542c33fcd7bf%40%3Cdev.apisix.apache.org%3E) to view the reference email send the announcement email to dev@apisix.apache.org and announce@apache.org
diff --git a/website/docs/general/security-guide.md b/website/docs/general/security-guide.md
index ad0d3ee..469a802 100644
--- a/website/docs/general/security-guide.md
+++ b/website/docs/general/security-guide.md
@@ -1,6 +1,6 @@
---
id: security
-title: Security
+title: Report a security vulnerability
keywords:
- API gateway
- APISIX
@@ -11,6 +11,8 @@ description: If you have apprehensions regarding APISIX’s security or you disc
The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache APISIX is also very concerned about security issues related to its features and functionality.
-If you have apprehensions regarding APISIX’s security or you discover vulnerability or potential threat, don’t hesitate to get in touch with the Apache Security Team by dropping a mail at security@apache.org. Please specify the project name as APISIX and its product name APISIX or APISIX-Dashboard in the email and describe the relevant problem or potential threat. You are also urged to recommend a way to reproduce and replicate the issue. The Apache Security Team and the APISIX community [...]
+If you have apprehensions regarding APISIX’s security or you discover vulnerability or potential threat, don’t hesitate to get in touch with the Apache Security Team by dropping a mail at security@apache.org.
+
+Please specify the project name as APISIX and its product name APISIX or APISIX-Dashboard in the email and describe the relevant problem or potential threat. You are also urged to recommend a way to reproduce and replicate the issue. The Apache Security Team and the APISIX community will get back to you after assessing and analyzing the findings.
Please pay attention to reporting the security issue on the security email before disclosing it to the public domain.
diff --git a/website/docs/general/sidebars.json b/website/docs/general/sidebars.json
index ac76b63..275be64 100644
--- a/website/docs/general/sidebars.json
+++ b/website/docs/general/sidebars.json
@@ -1,16 +1,27 @@
{
"docs": {
- "General": [
- "community",
+ "Community": [
+ "join",
"events",
- "contributor-guide",
- "committer-guide",
- "subscribe-guide",
- "blog",
- "security",
- "2fa",
- "release-guide",
- "integrate-with-project-docs"
+ {
+ "type": "category",
+ "label": "Contribute to APISIX",
+ "items": [
+ "submit-issue",
+ "contributor-guide",
+ "blog",
+ "security",
+ "committer-guide"
+ ]
+ },
+ {
+ "type": "category",
+ "label": "Process and style guides",
+ "items": [
+ "documentation-style-guide",
+ "release-guide"
+ ]
+ }
]
}
}
diff --git a/website/docs/general/submit-issue.md b/website/docs/general/submit-issue.md
new file mode 100644
index 0000000..968bafe
--- /dev/null
+++ b/website/docs/general/submit-issue.md
@@ -0,0 +1,28 @@
+---
+id: submit-issue
+title: Submitting an issue
+keywords:
+- APISIX
+- Apache APISIX
+- Issue
+- Bug
+description: Guidelines on filing a bug report or a feature request.
+---
+
+Please follow this guide while submitting an issue.
+
+Before submitting an issue, try solving the problem through a comprehensive search.
+
+[Open issues](https://github.com/apache/apisix/issues) and the [discussions forum](https://github.com/apache/apisix/discussions) are good places to search for solutions before opening an issue.
+
+To submit an issue:
+
+1. Check the [open issues](https://github.com/apache/apisix/issues) to avoid duplication.
+
+2. Create a [new issue](https://github.com/apache/apisix/issues/new/choose) and choose the type of issue.
+
+3. Define the issue with a clear and descriptive title.
+
+4. Fill in necessary information according to the template.
+
+5. Engage in the discussions in the issue and provide more information if necessary.
diff --git a/website/docs/general/subscribe-guide.md b/website/docs/general/subscribe-guide.md
deleted file mode 100644
index 8d3ecb2..0000000
--- a/website/docs/general/subscribe-guide.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-id: subscribe-guide
-slug: subscribe-guide
-title: Subscription Guide
-keywords:
-- API gateway
-- APISIX
-- Apache APISIX
-- Subscribe Guide
-description: Subscribe to the Apache APISIX mailing list to discuss issues, suggest new ideas and participate in other community discussions.
----
-
-You can subscribe to the Apache APISIX mailing list to discuss issues, suggest new ideas, and participate in other community discussions.
-
-1. To subscribe to the mailing list, first, send an email to dev-subscribe@apisix.apache.org.
-
-2. Once you send the email, you will receive a confirmation e-mail from dev-help@apisix.apache.org.
-
-3. Reply to this email to confirm your subscription.
-
-4. Once you confirm, you will receive a welcome email with instructions on using and communicating over the mailing list.
-
-5. To view archived emails from the mailing list, check out the [history](https://lists.apache.org/list.html?apisix.apache.org).
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 78075e6..0a6570a 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -353,7 +353,7 @@ module.exports = {
},
{
label: "Slack",
- to: "https://apisix.apache.org/docs/general/community",
+ to: "https://apisix.apache.org/docs/general/join",
},
{
label: "Twitter",
@@ -385,7 +385,7 @@ module.exports = {
backgroundColor: "#e8433e",
textColor: 'white',
content:
- '\u{1F914} Have queries regarding apache APISIX, Join slack channel to discuss them <a target="_blank" rel="noopener noreferrer" href="https://apisix.apache.org/docs/general/community">join #apisix channel</a>! ⭐️',
+ '\u{1F914} Have queries regarding apache APISIX, Join slack channel to discuss them <a target="_blank" rel="noopener noreferrer" href="https://apisix.apache.org/docs/general/join">join #apisix channel</a>! ⭐️',
},
prism: {
theme: require('prism-react-renderer/themes/github'),
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/08/30/Ingress-Meeting.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/08/30/Ingress-Meeting.md
index ad70691..6a29781 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/08/30/Ingress-Meeting.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/08/30/Ingress-Meeting.md
@@ -41,7 +41,7 @@ tags: [Events]
如果你对 Apache APISIX 的技术方向感兴趣，希望一同开发，或者有其他建议或意见，可以通过以下渠道参与：
1. 订阅并发送邮件至 dev@apisix.apache.org
-以 Apache Way 的方式参与社区，订阅方式见官网[订阅指南](https://apisix.apache.org/docs/general/subscribe-guide)。邮件列表是 Apache 社区最常用的沟通方式，社区会积极回复邮件列表中的问题。
+以 Apache Way 的方式参与社区，订阅方式见官网[订阅指南](https://apisix.apache.org/docs/general/join)。邮件列表是 Apache 社区最常用的沟通方式，社区会积极回复邮件列表中的问题。
2. 在 Apache APISIX Github discussion 发起讨论
欢迎大家在 GitHub discussion 讨论，[discussion](https://github.com/apache/apisix/discussions) 区非常活跃哦。我们也会不定期的将一些常见问题在 discussion 中进行汇总和答复，方便大家查找。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/10/13/celebrating-300-contributors-of-apisix.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/10/13/celebrating-300-contributors-of-apisix.md
index 37d1038..cdd21b9 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/10/13/celebrating-300-contributors-of-apisix.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/10/13/celebrating-300-contributors-of-apisix.md
@@ -48,6 +48,6 @@ Apache APISIX Ingress 项目每两周举办一次线上讨论，大家一同讨
- [Apache APISIX 社区周报 ｜ 2021 8.23-8.29](https://apisix.apache.org/zh/blog/2021/08/30/weekly-report)
- [Apache APISIX 社区周报 ｜ 2021 8.16-8.22](https://apisix.apache.org/zh/blog/2021/08/23/weekly-report)
-你希望 Apache APISIX 社区举办什么活动？或者想成为某个活动的组织者/志愿者，欢迎在[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)讨论！
+你希望 Apache APISIX 社区举办什么活动？或者想成为某个活动的组织者/志愿者，欢迎在[邮件列表](https://apisix.apache.org/zh/docs/general/join)讨论！
**社区大于代码**是 the Apache Way 中非常重要的准则，让我们一起秉承 the Apache Way，建设 Apache APISIX 以及 Apache APISIX 周边生态。Apache APISIX 社区，感恩有你；Apache APISIX 社区，也期待更多小伙伴加入。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/01/apisix-supports-azure-functions.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/01/apisix-supports-azure-functions.md
index 7d7f7ea..ba0e112 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/01/apisix-supports-azure-functions.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/01/apisix-supports-azure-functions.md
@@ -181,4 +181,4 @@ curl http://127.0.0.1:9080/apisix/admin/plugin_metadata/azure-functions \
## 总结
-`azure-functions` 插件是 Apache APISIX 为 serverless 设计的第二个插件。我们正在开发其他 serverless 插件，并会在即将发布的 Apache APISIX 版本中介绍这些插件。如果大家感兴趣，请[提交 Issue](https://github.com/apache/apisix/issues/new/choose)来分享你的意见，也可以在我们的[邮件列表](https://apisix.apache.org/docs/general/community)中分享开发新插件的建议!
+`azure-functions` 插件是 Apache APISIX 为 serverless 设计的第二个插件。我们正在开发其他 serverless 插件，并会在即将发布的 Apache APISIX 版本中介绍这些插件。如果大家感兴趣，请[提交 Issue](https://github.com/apache/apisix/issues/new/choose)来分享你的意见，也可以在我们的[邮件列表](https://apisix.apache.org/docs/general/join)中分享开发新插件的建议!
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/22/google-logging.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/22/google-logging.md
index f434242..5354d69 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/22/google-logging.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/22/google-logging.md
@@ -200,7 +200,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
Apache APISIX 不仅致力于保持自身的高性能，也一直非常重视开源生态的建设。目前 Apache APISIX 已经拥有了 10+ 个日志相关的插件，支持与业界主流的开源日志项目对接。
-如果你有对接其他日志的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)，通过邮件表达你的想法。
+如果你有对接其他日志的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/join)，通过邮件表达你的想法。
## 相关阅读
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/apisix-integrate-openwhisk-plugin.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
index 52a5279..93b8bff 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/apisix-integrate-openwhisk-plugin.md
@@ -183,4 +183,4 @@ A test body
本文为大家介绍了关于 `openwhisk` 插件的功能前瞻与使用步骤，更多关于 `openwhisk` 插件说明和完整配置列表，可以参考[官方文档](https://apisix.apache.org/docs/apisix/next/plugins/openwhisk)。
-目前，我们也在开发其他 Serverless 插件以便与更多云服务进行集成。如果您对此类集成项目感兴趣，也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+目前，我们也在开发其他 Serverless 插件以便与更多云服务进行集成。如果您对此类集成项目感兴趣，也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/open-policy-agent.md b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/open-policy-agent.md
index 6f156b2..7e0b9f7 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/open-policy-agent.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2021/12/24/open-policy-agent.md
@@ -239,4 +239,4 @@ Server: APISIX/2.11.0
Apache APISIX 不仅致力于保持自身的高性能，也一直非常重视开源生态的建设。目前 Apache APISIX 已经拥有了 10+ 个认证授权相关的插件，支持与业界主流的认证授权服务对接。
-如果你有对接其他认证授权的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)，通过邮件表达你的想法。
+如果你有对接其他认证授权的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/join)，通过邮件表达你的想法。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/04/authing.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/04/authing.md
index f43b9eb..b0d70b8 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/04/authing.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/04/authing.md
@@ -254,4 +254,4 @@ curl -XPOST 127.0.0.1:9080/apisix/admin/routes -H "X-Api-Key: edd1c9f034335f136
Apache APISIX 不仅致力于保持自身的高性能，也一直非常重视开源生态的建设。目前 Apache APISIX 已经拥有了 10+ 个认证授权相关的插件，支持与业界主流的认证授权服务对接。
-如果你有对接其他认证授权的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)，通过邮件表达你的想法。
+如果你有对接其他认证授权的需求，不妨访问 Apache APISIX 的 [GitHub](https://github.com/apache/apisix/issues)，通过 issue 留下你的建议；或订阅 Apache APISIX 的[邮件列表](https://apisix.apache.org/zh/docs/general/join)，通过邮件表达你的想法。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/17/apisix-kafka-integration.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/17/apisix-kafka-integration.md
index df92fb6..951fa8e 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/17/apisix-kafka-integration.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/17/apisix-kafka-integration.md
@@ -214,4 +214,4 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
本文为大家介绍了关于 kafka-logger 插件的功能前瞻与使用步骤，更多关于 kafka-logger 插件说明和完整配置列表，可以参考官方文档。
-也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/20/upyun-public-gateway-usecase.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/20/upyun-public-gateway-usecase.md
index 034c579..e7aceb7 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/20/upyun-public-gateway-usecase.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/20/upyun-public-gateway-usecase.md
@@ -120,4 +120,4 @@ end
又拍云作为 CDN 云上处理业务方，已经逐渐在公网网关和 Ingress 层面深度使用 Apache APISIX。希望通过这一系列的用户案例分享，能为大家在网关选型的过程中提供一些思路与方向。
-同时，Apache APISIX 也欢迎正在使用 APISIX 的企业用户积极参与分享相关用户案例实践，也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+同时，Apache APISIX 也欢迎正在使用 APISIX 的企业用户积极参与分享相关用户案例实践，也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-hashicorp-vault-integration.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-hashicorp-vault-integration.md
index 27cef49..5e54bb1 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-hashicorp-vault-integration.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-hashicorp-vault-integration.md
@@ -375,7 +375,7 @@ $ curl http://127.0.0.1:9080/apisix/admin/consumers -H 'X-API-KEY: edd1c9f034335
本文为大家带来了 Apache APISIX 即将发布的 Vault 插件以及相关细节。
-欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
## Reference
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
index 0a289e3..289bbd6 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/21/apisix-xrpc-details-and-miltilingual.md
@@ -132,4 +132,4 @@ APISIX 一旦感知到 Runner 中的 `response` 对象被操作就会立即终
## 总结
-本文为大家带来了 Apache APISIX 即将发布的 xRPC 框架以及相关细节，同时介绍了 Apache APISIX 在多语言开发支持中的细节展示。通过多协议代理与多语言支持两个角度，充分展示了 Apache APISIX 在面向生态的多项努力。也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+本文为大家带来了 Apache APISIX 即将发布的 xRPC 框架以及相关细节，同时介绍了 Apache APISIX 在多语言开发支持中的细节展示。通过多协议代理与多语言支持两个角度，充分展示了 Apache APISIX 在面向生态的多项努力。也欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/25/apisix-grpc-web-integration.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/25/apisix-grpc-web-integration.md
index a71b234..93c2eb0 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/25/apisix-grpc-web-integration.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/25/apisix-grpc-web-integration.md
@@ -301,4 +301,4 @@ gRPC Web Client -> Apache APISIX（protocol conversion & data codec） -> gRPC s
本文为大家带来了 Apache APISIX 的 `grpc-web` 插件讲解及实战案例。
-欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+欢迎随时在 [GitHub Discussions](https://github.com/apache/apisix/discussions) 中发起讨论，或通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/26/apisix-integrate-forward-auth-plugin.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
index aa01f4b..2d63e0d 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/01/26/apisix-integrate-forward-auth-plugin.md
@@ -97,4 +97,4 @@ Location: https://example.com/auth
想要获取更多关于 `forward-auth` 插件说明和完整配置列表，可参考[官方文档](https://apisix.apache.org/docs/apisix/next/plugins/forward-auth)。同时，如果您有更加复杂的认证或授权应用场景，也可以尝试使用 `opa` 插件，该插件允许以可编程的方式提供更强大的功能。
-目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/10/splunk-apisix-integration.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/10/splunk-apisix-integration.md
index 250bc49..a72abb2 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/10/splunk-apisix-integration.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/10/splunk-apisix-integration.md
@@ -182,7 +182,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
## 总结
-目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/zh/docs/general/subscribe-guide)进行交流。
+目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/zh/docs/general/join)进行交流。
## 相关阅读
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/16/file-logger-api-gateway.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/16/file-logger-api-gateway.md
index 4429f77..f7d65cd 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/16/file-logger-api-gateway.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/16/file-logger-api-gateway.md
@@ -351,7 +351,7 @@ property "path" is required
以上就是我作为一个后端新手，从 0 开始实现一款 Apache APISIX 插件的全过程。在开发插件的过程中确实碰到了很多坑，比较幸运的是 Apache APISIX 社区里面有很多热心的大佬帮我解惑，使得 `file-logger` 插件的开发和测试全程都比较顺畅。如果你对这个插件感兴趣，或想要查看插件详情，可以参考 [Apache APISIX 官方文档](https://apisix.apache.org/zh/docs/apisix/next/plugins/file-logger/)。
-目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流讨论。
+目前，Apache APISIX 也在开发其他插件以支持集成更多服务，如果您对此感兴趣，欢迎随时在 [GitHub Discussion](https://github.com/apache/apisix/discussions) 中发起讨论，也可通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流讨论。
## 参考资料
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/21/nacos-api-gateway.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/21/nacos-api-gateway.md
index ee31a92..8bb0f9b 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/21/nacos-api-gateway.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/21/nacos-api-gateway.md
@@ -196,4 +196,4 @@ Apache APISIX + Nacos 可以将各个微服务节点中与业务无关的各项
关于 `nacos` 插件的更多说明和完整配置信息，可参考 [Apache APISIX 官方文档](https://apisix.apache.org/zh/docs/apisix/discovery/nacos)。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/23/csrf-api-gateway.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/23/csrf-api-gateway.md
index cf438d2..366a47d 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/23/csrf-api-gateway.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/23/csrf-api-gateway.md
@@ -142,4 +142,4 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
本文详细描述了 `csrf` 插件的工作方式以及使用方法，希望通过本文可以让大家对在 Apache APISIX 中使用插件拦截 CSRF 攻击有更清晰的认识，方便在实际场景中应用。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/25/consul-api-gateway.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/25/consul-api-gateway.md
index 9028349..a397576 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/25/consul-api-gateway.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/25/consul-api-gateway.md
@@ -247,4 +247,4 @@ hello web2%
本文的前半部分介绍了 Apache APISIX 如何配合 Consul 实现基于 Consul KV 的服务发现注册中心，解决服务信息管理维护的问题。而在后半部分则着重介绍了如何在 Docker 中搭配 Consul 使用 Apache APISIX 的操作流程。当然，在实际场景中的应用，还需要各位读者根据业务使用场景和已有的系统架构具体分析。关于在 Apache APISIX 中使用 Consul 注册中心的更多说明，可以在[官方文档](https://apisix.apache.org/zh/docs/apisix/discovery/consul_kv/)中找到。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/28/apisix-integration-opentelemetry-plugin.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/28/apisix-integration-opentelemetry-plugin.md
index a683037..80b3f80 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/28/apisix-integration-opentelemetry-plugin.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/02/28/apisix-integration-opentelemetry-plugin.md
@@ -320,7 +320,7 @@ services:
Apache APISIX 在集成 OpenTelemetery 之后，借助 OpenTelemetry 丰富的插件能够与市场上大部分主流的 Trace 系统轻松实现对接。此外，Apache APISIX 也实现了 SkyWalking 和 Zipkin 原生标准协议插件，也在积极与各大社区合作打造更加强大的生态。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
## 相关阅读
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/01/apisix-integration-public-api-plugin.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/01/apisix-integration-public-api-plugin.md
index e4c147e..e8bcc53 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/01/apisix-integration-public-api-plugin.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/01/apisix-integration-public-api-plugin.md
@@ -246,4 +246,4 @@ Apache APISIX 不再进行两阶段的 Route 路由匹配和执行不同的逻
关于 `public-api` 插件的更多说明和完整配置信息，您可以参考 [Apache APISIX 官方文档](https://apisix.apache.org/docs/apisix/next/plugins/public-api)。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/02/apisix-integration-graphql-plugin.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/02/apisix-integration-graphql-plugin.md
index 240982e..7ec1b41 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/02/apisix-integration-graphql-plugin.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/02/apisix-integration-graphql-plugin.md
@@ -344,4 +344,4 @@ Apache APISIX 提供了包括但不仅限于 [`prometheus`](https://apisix.apach
关于 GraphQL 的更多说明和完整配置信息，可参考 [Apache APISIX官方文档](https://apisix.apache.org/zh/docs/apisix/router-radixtree/#%E5%A6%82%E4%BD%95%E9%80%9A%E8%BF%87-graphql-%E5%B1%9E%E6%80%A7%E8%BF%87%E6%BB%A4%E8%B7%AF%E7%94%B1)。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
index 509ed07..0609b80 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/04/apisix-uses-coredns-enable-service-discovery.md
@@ -258,4 +258,4 @@ app.listen(3005);
本文主要介绍了服务发现的类型以及在 Apache APISIX 中如何使用 CoreDNS。您可以根据自身的业务需求和过往技术架构使用 Apache APISIX 与 CoreDNS。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流。
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流。
diff --git a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/05/apisix-integration-eureka-service-discovery.md b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/05/apisix-integration-eureka-service-discovery.md
index 1cbbee9..08413c1 100644
--- a/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/05/apisix-integration-eureka-service-discovery.md
+++ b/website/i18n/zh/docusaurus-plugin-content-blog/2022/03/05/apisix-integration-eureka-service-discovery.md
@@ -263,4 +263,4 @@ Spring Cloud 是一个广受用户欢迎的微服务框架，而 Apache APISIX
关于 `eureka` 插件的更多说明和完整配置信息，可参考 [Apache APISIX 官网文档](https://apisix.apache.org/zh/docs/apisix/discovery#%E5%A6%82%E4%BD%95%E6%89%A9%E5%B1%95%E6%B3%A8%E5%86%8C%E4%B8%AD%E5%BF%83%EF%BC%9F)。
-Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/subscribe-guide)进行交流.
+Apache APISIX 项目目前正在开发其他插件以支持集成更多服务，如果您对此有兴趣，您可以通过 [GitHub Discussions](https://github.com/apache/apisix/discussions) 发起讨论，或通过[邮件列表](https://apisix.apache.org/docs/general/join)进行交流.
diff --git a/website/src/pages/help.js b/website/src/pages/help.js
index 91ea4d4..9d9869b 100644
--- a/website/src/pages/help.js
+++ b/website/src/pages/help.js
@@ -70,7 +70,7 @@ function Help(props) {
<ChevronRight />
</a>
<a
- href="https://apisix.apache.org/docs/general/community"
+ href="https://apisix.apache.org/docs/general/join"
target="_blank"
>
Slack
diff --git a/website/src/pages/sections/home-events-section.jsx b/website/src/pages/sections/home-events-section.jsx
index 42dab07..8a50210 100644
--- a/website/src/pages/sections/home-events-section.jsx
+++ b/website/src/pages/sections/home-events-section.jsx
@@ -49,7 +49,7 @@ const HomeEventsSection = () => {
Stay up to date about all Apache APISIX™ News, subscribe to our{" "}
<a hred="%">newsletter.</a>
</p>
- <a className="news-button" href="/docs/general/subscribe-guide">
+ <a className="news-button" href="/docs/general/join">
Subscribe
</a>
</div>