You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/07/15 13:10:55 UTC
[incubator-apisix-website] branch feat-graduate created (now
20a8770)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a change to branch feat-graduate
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git.
at 20a8770 feat(graduate): remove incubating text
This branch includes the following new commits:
new 20a8770 feat(graduate): remove incubating text
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-apisix-website] 01/01: feat(graduate): remove incubating
text
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch feat-graduate
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
commit 20a877024ba14e4fdec061146b2d4e9fda5a8157
Author: juzhiyuan <ju...@apache.org>
AuthorDate: Wed Jul 15 21:08:01 2020 +0800
feat(graduate): remove incubating text
---
README.md | 4 ++--
config.yaml | 22 ++++++++--------------
content/contribute/committer/index.en.md | 2 +-
content/contribute/committer/index.zh.md | 2 +-
content/contribute/contributor/index.en.md | 2 +-
content/contribute/contributor/index.zh.md | 2 +-
content/contribute/security/index.en.md | 4 ++--
content/contribute/security/index.zh.md | 4 ++--
content/contribute/subscribe/index.en.md | 4 ++--
content/contribute/subscribe/index.zh.md | 4 ++--
content/downloads/index.en.md | 12 +-----------
content/downloads/index.zh.md | 12 +-----------
content/team/index.en.md | 8 ++++----
content/team/index.zh.md | 6 +++---
layouts/partials/footer.html | 4 ++--
15 files changed, 33 insertions(+), 59 deletions(-)
diff --git a/README.md b/README.md
index 28c277d..31f9715 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Apache APISIX (incubating)
+# Apache APISIX
-> The website of [Apache APISIX (incubating)](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway.
+> The website of [Apache APISIX](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway.
## Development
```sh
diff --git a/config.yaml b/config.yaml
index 9b913a6..2a641e3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,5 +1,5 @@
-baseURL: https://apisix.incubator.apache.org/
-title: Apache APISIX (incubating)
+baseURL: https://apisix.apache.org/
+title: Apache APISIX
theme: hugo-fresh
googleAnalytics: #Put in your tracking code without quotes like this: UA-XXXXXX...
#Disables warningss
@@ -13,10 +13,10 @@ languages:
params:
hero:
# Main hero title
- title: Apache APISIX (incubating)
+ title: Apache APISIX
# Hero subtitle (optional)
subtitle1: Cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.
- subtitle2: Apache APISIX (incubating) is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system.
+ subtitle2: Apache APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system.
subtitle3: Apache releases are beginning from version 0.9.
# Button text
buttontext: View on GitHub
@@ -77,7 +77,7 @@ languages:
name: 中
link: /zh
section1:
- title: Why Apache APISIX (incubating)？
+ title: Why Apache APISIX？
tiles:
- title: High availability, safety first
icon: mouse-globe
@@ -94,9 +94,6 @@ languages:
section5: true
footer:
quicklinks:
- column1:
- title: "Disclaimer"
- text: Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indica [...]
column2:
title: "Documentation"
links:
@@ -110,7 +107,7 @@ languages:
params:
hero:
# Main hero title
- title: Apache APISIX (incubating)
+ title: Apache APISIX
# Hero subtitle (optional)
subtitle1: 云原生、高性能、可扩展的微服务 API 网关
subtitle2: 基于 Nginx 和 etcd 来实现，具备动态路由、插件热加载和 gRPC 代理和协议转换功能，更适合微服务体系下的 API 管理
@@ -174,7 +171,7 @@ languages:
name: EN
link: /
section1:
- title: 为什么选择 Apache APISIX (incubating)？
+ title: 为什么选择 Apache APISIX？
tiles:
- title: 高可用，安全第一
icon: mouse-globe
@@ -189,14 +186,11 @@ languages:
icon: doc-sync
text: 支持 http 到 gRPC 的协议转换，支持 websocket、gRPC、Dubbo、MQTT 的代理，支持包括 ARM64 在内的多种平台
section3:
- title: 谁在使用 Apache APISIX (incubating)？
+ title: 谁在使用 Apache APISIX？
image: https://raw.githubusercontent.com/iresty/iresty.com/master/user-wall.jpg
section5: true
footer:
quicklinks:
- column1:
- title: "Disclaimer"
- text: Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate [...]
column2:
title: "Documentation"
links:
diff --git a/content/contribute/committer/index.en.md b/content/contribute/committer/index.en.md
index df66509..ecd5231 100644
--- a/content/contribute/committer/index.en.md
+++ b/content/contribute/committer/index.en.md
@@ -28,7 +28,7 @@ include_footer: true
<br />
<section>
<h2 class="title">Promotion</h2>
- <p>The Apache APISIX (incubating) community follows the <a href="http://community.apache.org/newcommitter.html">Apache Community’s process</a> on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC.</p>
+ <p>The Apache APISIX community follows the <a href="http://community.apache.org/newcommitter.html">Apache Community’s process</a> on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC.</p>
<p>Processes are:</p>
<p>1. Start the discussion and vote in @private. Only current PMC member could nominate</p>
<p>2. If the vote passes, send an offer to become a committer with @private CC’ed</p>
diff --git a/content/contribute/committer/index.zh.md b/content/contribute/committer/index.zh.md
index 365d87e..616e3a0 100644
--- a/content/contribute/committer/index.zh.md
+++ b/content/contribute/committer/index.zh.md
@@ -7,7 +7,7 @@ include_footer: true
<div>
<section>
<h2 class="title">加入提交者</h2>
- <p>Apache APISIX (incubating) 社区遵照 <a href="http://community.apache.org/newcommitter.html">Apache 社区</a> 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。</p>
+ <p>Apache APISIX 社区遵照 <a href="http://community.apache.org/newcommitter.html">Apache 社区</a> 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。</p>
<p>流程如下：</p>
<p>1. 在 @private 邮件列表中发起讨论，注意：当前只有 PMC 可以提名；</p>
<p>2. 如果投票通过，将发送邀请函以成为提交者，需 CC @private 邮件列表；</p>
diff --git a/content/contribute/contributor/index.en.md b/content/contribute/contributor/index.en.md
index a9f0f9e..7077d96 100644
--- a/content/contribute/contributor/index.en.md
+++ b/content/contribute/contributor/index.en.md
@@ -58,7 +58,7 @@ include_footer: true
<p></p>
<p>1. Send a pull request to the master branch.</p>
<p>2. The mentor will do codes review before discussing some details (including the design, the implementation and the performance) with you.</p>
- <p>3. Then congratulate to you to be an official contributor of Apache APISIX (incubating).</p>
+ <p>3. Then congratulate to you to be an official contributor of Apache APISIX.</p>
<br />
<h3 class="subtitle">Delete branch</h3>
<p></p>
diff --git a/content/contribute/contributor/index.zh.md b/content/contribute/contributor/index.zh.md
index 2d914be..6c00dc6 100644
--- a/content/contribute/contributor/index.zh.md
+++ b/content/contribute/contributor/index.zh.md
@@ -58,7 +58,7 @@ include_footer: true
<p></p>
<p>1. Send a pull request to the master branch.</p>
<p>2. The mentor will do codes review before discussing some details (including the design, the implementation and the performance) with you.</p>
- <p>3. Then congratulate to you to be an official contributor of Apache APISIX (incubating).</p>
+ <p>3. Then congratulate to you to be an official contributor of Apache APISIX.</p>
<br />
<h3 class="subtitle">Delete branch</h3>
<p></p>
diff --git a/content/contribute/security/index.en.md b/content/contribute/security/index.en.md
index ead78bf..2209bd9 100644
--- a/content/contribute/security/index.en.md
+++ b/content/contribute/security/index.en.md
@@ -5,9 +5,9 @@ include_footer: true
---
<div class="security">
- <p>The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache Incubator APISIX is also very concerned Security issues related to its features and functionality.</p>
+ <p>The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache APISIX is also very concerned Security issues related to its features and functionality.</p>
- <p>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 <a href="mailto:security@apache.org">security@apache.org</a>. Please specify the project name as Incubator APISIX and its product name APISIX or APISIX-Dashboard in the email and provide a description of the relevant problem or potential threat. You are also urged to recommend the way to reproduce [...]
+ <p>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 <a href="mailto:security@apache.org">security@apache.org</a>. Please specify the project name as APISIX and its product name APISIX or APISIX-Dashboard in the email and provide a description of the relevant problem or potential threat. You are also urged to recommend the way to reproduce and replic [...]
<p>Please pay attention to report the security issue on the security email before disclosing it on public domain.</p>
</div>
\ No newline at end of file
diff --git a/content/contribute/security/index.zh.md b/content/contribute/security/index.zh.md
index 5d28996..70a23e8 100644
--- a/content/contribute/security/index.zh.md
+++ b/content/contribute/security/index.zh.md
@@ -5,9 +5,9 @@ include_footer: true
---
<div class="security">
- <p>The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache Incubator APISIX is also very concerned Security issues related to its features and functionality.</p>
+ <p>The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache APISIX is also very concerned Security issues related to its features and functionality.</p>
- <p>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 <a href="mailto:security@apache.org">security@apache.org</a>. Please specify the project name as Incubator APISIX and its product name APISIX or APISIX-Dashboard in the email and provide a description of the relevant problem or potential threat. You are also urged to recommend the way to reproduce [...]
+ <p>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 <a href="mailto:security@apache.org">security@apache.org</a>. Please specify the project name as APISIX and its product name APISIX or APISIX-Dashboard in the email and provide a description of the relevant problem or potential threat. You are also urged to recommend the way to reproduce and replic [...]
<p>Please pay attention to report the security issue on the security email before disclosing it on public domain.</p>
</div>
\ No newline at end of file
diff --git a/content/contribute/subscribe/index.en.md b/content/contribute/subscribe/index.en.md
index 0d85d7f..474d27b 100644
--- a/content/contribute/subscribe/index.en.md
+++ b/content/contribute/subscribe/index.en.md
@@ -6,10 +6,10 @@ include_footer: true
<div>
<section>
- <p>During the process of using Apache APISIX (incubating), if there has any problems, suggestion or new ideas, please feel free to use the Apache mailing-list to participate in the community construction.</p>
+ <p>During the process of using Apache APISIX, if there has any problems, suggestion or new ideas, please feel free to use the Apache mailing-list to participate in the community construction.</p>
<p>1. Send e-mail to subscribe the mailing-list first. Use your mailbox to send an e-mail to <a href="mailto:dev-subscribe@apisix.apache.org">dev-subscribe@apisix.apache.org</a> with any subjects or contents.</p>
<p>2. Receive and reply the confirmation e-mail. After Step 1, you will receive a confirmation e-mail from dev-help@apisix.apache.org (if you can not receive that, please check “RSS feeds”, “junk e-mail” or other items). Reply that e-mail directly or click the link in e-mail to reply, with any subjects or contents.</p>
- <p>3. Receive the Welcome e-mail. After finishing the two steps above, an e-mail with the subject of <strong>WELCOME to dev@apisix.apache.org</strong> will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache Incubating APISIX mailing-list.</p>
+ <p>3. Receive the Welcome e-mail. After finishing the two steps above, an e-mail with the subject of <strong>WELCOME to dev@apisix.apache.org</strong> will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache APISIX mailing-list.</p>
<p>4. Until now, you can interact with community by your subscribed email or track email conversations by Archived email list.</p>
</section>
</div>
\ No newline at end of file
diff --git a/content/contribute/subscribe/index.zh.md b/content/contribute/subscribe/index.zh.md
index 07f84db..d1148cc 100644
--- a/content/contribute/subscribe/index.zh.md
+++ b/content/contribute/subscribe/index.zh.md
@@ -6,10 +6,10 @@ include_footer: true
<div>
<section>
- <p>在使用 Apache APISIX (incubating) 的过程中，若遇到任何问题，或有建议、想法，请大胆地使用 Appache 邮件列表与社区成员互动。</p>
+ <p>在使用 Apache APISIX 的过程中，若遇到任何问题，或有建议、想法，请大胆地使用 Appache 邮件列表与社区成员互动。</p>
<p>1. 发送邮件以订阅：使用你的常用邮箱，发送一封包含任意内容的邮件至 <a href="mailto:dev-subscribe@apisix.apache.org">dev-subscribe@apisix.apache.org</a> 。</p>
<p>2. 发送确认订阅邮件：第一步完成后，你将收到一封来自 dev-help@apisix.apache.org 的邮件，（若没有收到，请稍后检查诸如 RSS Feeds、垃圾邮件等选项卡）。接着，请回复任意内容至该邮件，以便完成订阅确认。</p>
<p>3. 接收欢迎邮件：完成上述步骤后，你将收到一封题为 <strong>WELCOME to dev@apisix.apache.org</strong> 的邮件，这表示你已成功订阅该邮件列表。</p>
- <p>4. 此后，你将可以通过该邮箱收到 Apache APISIX (incubating) 最新的邮件，也欢迎你通过邮件列表与社区交流！</p>
+ <p>4. 此后，你将可以通过该邮箱收到 Apache APISIX 最新的邮件，也欢迎你通过邮件列表与社区交流！</p>
</section>
</div>
\ No newline at end of file
diff --git a/content/downloads/index.en.md b/content/downloads/index.en.md
index e35c1ff..a305122 100644
--- a/content/downloads/index.en.md
+++ b/content/downloads/index.en.md
@@ -8,7 +8,7 @@ include_footer: true
<section>
<h2 class="title">Releases</h2>
<p class="description">
- Apache APISIX (incubating) is released as source code tarballs. The downloads are distributed via mirror sites and should be
+ Apache APISIX is released as source code tarballs. The downloads are distributed via mirror sites and should be
checked for tampering using GPG or SHA-512.
</p>
<div class="table-container" role="table" aria-label="Destinations">
@@ -147,14 +147,4 @@ include_footer: true
{{< / highlight >}}
<p />
</section>
- <section>
- <h2 class="title">Disclaimer</h2>
- <p>
- Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF),
- sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further
- review indicates that the infrastructure, communications, and decision making process have stabilized in a manner
- consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the
- completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
- </p>
- </section>
</div>
diff --git a/content/downloads/index.zh.md b/content/downloads/index.zh.md
index c3fe2a1..8568914 100644
--- a/content/downloads/index.zh.md
+++ b/content/downloads/index.zh.md
@@ -8,7 +8,7 @@ include_footer: true
<section>
<h2 class="title">Releases</h2>
<p class="description">
- Apache APISIX (incubating) is released as source code tarballs. The downloads are distributed via mirror sites and should be
+ Apache APISIX is released as source code tarballs. The downloads are distributed via mirror sites and should be
checked for tampering using GPG or SHA-512.
</p>
<div class="table-container" role="table" aria-label="Destinations">
@@ -147,14 +147,4 @@ include_footer: true
{{< / highlight >}}
<p />
</section>
- <section>
- <h2 class="title">Disclaimer</h2>
- <p>
- Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF),
- sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further
- review indicates that the infrastructure, communications, and decision making process have stabilized in a manner
- consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the
- completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
- </p>
- </section>
</div>
diff --git a/content/team/index.en.md b/content/team/index.en.md
index 074cdf6..fc841a9 100644
--- a/content/team/index.en.md
+++ b/content/team/index.en.md
@@ -199,19 +199,19 @@ include_footer: true
</section>
<section>
<h2 class="title">Contributors</h2>
- <p class="description">You can find all contributors of Apache APISIX (incubating) from GitHub contribution list.</p>
+ <p class="description">You can find all contributors of Apache APISIX from GitHub contribution list.</p>
<p class="description">
- <a href="https://github.com/apache/incubator-apisix/graphs/contributors">1. incubator-apisix</a>
+ <a href="https://github.com/apache/incubator-apisix/graphs/contributors">1. apisix</a>
</p>
<p class="description">
- <a href="https://github.com/apache/incubator-apisix-dashboard/graphs/contributors">2. incubator-apisix-dashboard</a>
+ <a href="https://github.com/apache/incubator-apisix-dashboard/graphs/contributors">2. apisix-dashboard</a>
</p>
</section>
<p class="description"> </p>
<section>
<h2 class="title">Becoming a Committer</h2>
<p class="description">
- The Apache APISIX (incubating) community follows the <a href="http://community.apache.org/newcommitter.html">Apache Community’s process</a> on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC.
+ The Apache APISIX community follows the <a href="http://community.apache.org/newcommitter.html">Apache Community’s process</a> on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC.
</p>
<p>You can read Contributor Guide(TODO) to participate the community, and can get more information on <a href="/contribute/committer/">Committer Guide</a>.</p>
</section>
diff --git a/content/team/index.zh.md b/content/team/index.zh.md
index 8810e8c..070da22 100644
--- a/content/team/index.zh.md
+++ b/content/team/index.zh.md
@@ -201,17 +201,17 @@ include_footer: true
<h2 class="title">贡献者</h2>
<p class="description">你可以在下方链接中查看所有贡献者：</p>
<p class="description">
- <a href="https://github.com/apache/incubator-apisix/graphs/contributors">1. incubator-apisix</a>
+ <a href="https://github.com/apache/incubator-apisix/graphs/contributors">1. apisix</a>
</p>
<p class="description">
- <a href="https://github.com/apache/incubator-apisix-dashboard/graphs/contributors">2. incubator-apisix-dashboard</a>
+ <a href="https://github.com/apache/incubator-apisix-dashboard/graphs/contributors">2. apisix-dashboard</a>
</p>
</section>
<p class="description"> </p>
<section>
<h2 class="title">成为提交者</h2>
<p class="description">
- Apache APISIX (incubating) 社区遵照 <a href="http://community.apache.org/newcommitter.html">Apache 社区</a> 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。
+ Apache APISIX 社区遵照 <a href="http://community.apache.org/newcommitter.html">Apache 社区</a> 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。
</p>
<p>你可以阅读贡献指南（TODO）以了解如何参加社区，也可以从 <a href="/zh/contribute/committer/">提交者指南</a> 了解如何成为提交者。</p>
</section>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index d549cef..71f9603 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -28,7 +28,7 @@
<div class="footer-column">
<div class="footer-header"></div>
<div class="footer-description" style="text-align: center;">
- <a href="http://www.apache.org/" target="_blank"><img src="https://www.apache.org/foundation/press/kit/asf_logo_wide_small.png" alt="Apache APISIX (incubating)" ></a>
+ <a href="http://www.apache.org/" target="_blank"><img src="https://www.apache.org/foundation/press/kit/asf_logo_wide_small.png" alt="Apache APISIX" ></a>
</div>
<ul class="link-list">
</ul>
@@ -37,7 +37,7 @@
</div>
<div class="divider"></div>
<div class="copyright">
-Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX (incubating), and its feather logo are trademarks of The Apache Software Foundation.
+Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation.
</div>
</div>
</footer>