This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shenyu-website.git
The following commit(s) were added to refs/heads/main by this push:
new c0e89dc5b4 #663 Modify Sign ICLA Guide (#664)
c0e89dc5b4 is described below
commit c0e89dc5b4c814861cf7f81e1746618b573d7ba3
Author: nuo-promise <[email protected]>
AuthorDate: Mon Aug 1 11:14:04 2022 +0800
#663 Modify Sign ICLA Guide (#664)
* #663 Modify Sign ICLA Guide
* #663 Modify Sign ICLA Guide
---
community/4-icla.md | 32 ++++++----
.../current/4-icla.md | 69 ++++++++++++---------
static/img/shenyu/icla/doc_content.png | Bin 459064 -> 0 bytes
static/img/shenyu/icla/doc_example.png | Bin 527579 -> 0 bytes
static/img/shenyu/icla/download.png | Bin 28101 -> 0 bytes
static/img/shenyu/icla/download_v2.0.png | Bin 0 -> 83007 bytes
static/img/shenyu/icla/email.png | Bin 65689 -> 0 bytes
static/img/shenyu/icla/email_template_file.png | Bin 16071 -> 0 bytes
static/img/shenyu/icla/email_v2.0.png | Bin 0 -> 112519 bytes
static/img/shenyu/icla/example.png | Bin 176236 -> 0 bytes
static/img/shenyu/icla/example_v2.0.png | Bin 0 -> 436923 bytes
static/img/shenyu/icla/information.png | Bin 51222 -> 0 bytes
static/img/shenyu/icla/information_v2.0.png | Bin 0 -> 452531 bytes
static/img/shenyu/icla/page_link.png | Bin 44741 -> 0 bytes
static/img/shenyu/icla/page_link_v2.0.png | Bin 0 -> 134301 bytes
static/img/shenyu/icla/pls_sign.png | Bin 192690 -> 0 bytes
static/img/shenyu/icla/pls_sign_v2.0.png | Bin 0 -> 488535 bytes
static/img/shenyu/icla/sign.png | Bin 13508 -> 0 bytes
static/img/shenyu/icla/sign_v2.0.png | Bin 0 -> 31604 bytes
static/img/shenyu/icla/write_info.png | Bin 14670 -> 0 bytes
static/img/shenyu/icla/write_info_v2.0.png | Bin 0 -> 173984 bytes
21 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/community/4-icla.md b/community/4-icla.md
index 379262c1b8..8d2f5dff27 100644
--- a/community/4-icla.md
+++ b/community/4-icla.md
@@ -14,36 +14,43 @@ cover: "/img/architecture/shenyu-framework.png"
Apache CLA short for Apache Contributor License Agreement, the purpose of this
agreement is to clearly define the terms under which intellectual property has
been contributed to the ASF and thereby allow us to defend the project should
there be a legal dispute regarding the software at some future time.
A signed ICLA is required to be on file before an individual is given commit
rights to any ASF project.
+If you have already signed an Apache ICLA, no need to send an email. As you
have already submitted an ICLA under your public name, no need to resubmit it.
If you have never signed an ICLA, please indicate this in your email, and PMC
can apply for this account directly.
+
The process of submitting ICLA are:
**1. First, click the link [Apache
Licenses](https://www.apache.org/licenses/#clas) and find CLAs under the
Contributor License Agreements section.**
-
+
**2. At the top of the page, there are two download links choose
ICLA(Individual Contributor License Agreement) and download it.**
-
+
**3. Open the PDF, and fill in the following columns in English.**
> To be noticed:
-> - Leave a space between family name and last name, remember capitalize the
first letter, please write family name at first.
+>
+> - Tick the family first box
+> - Leave a space between family name and last name, remember capitalize the
first letter, please write family name at first. Leave the public name empty or
add a name with more than a single word; this is not an id
+> - Include your complete postal address where you receive postal mail, not a
conference room or corporate address
+> - If you sign with a gpg signature, be sure that the email in the public key
matches the email on the form
> - Preferred Apache id(s) is a required field for committers.
-
+
**4. The signature at the bottom of the document:**
Apache only accept hand-written signature or [PDF signature
software](https://pdf.yozocloud.cn/p/pdfaddsign)
-**5.After signing, send the icla.pdf command as `username-icla.pdf` to the
email address provided by the instructor**
+**5.After signing, send the icla.pdf command as `username-icla.pdf` to the
email address `[email protected]` and copy to `[email protected]`,
Do not copy any other person or list.**
**6.After the email is sent successfully, Apache ShenYu official community
informs**
## Manual signature and PDF software signature Demo
{#manual-signature-and-pdf-software-signature-demo}
> PDF online signature
+>
> - Download the PDF source file
> - Fill in items and personal information
> - Open PDF and sign URL online
@@ -52,11 +59,12 @@ Apache only accept hand-written signature or [PDF signature
software](https://pd
> - Send to the specified mailbox
> - [icla Sign status
> document](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/ 《icla Sign status
> document》, you can copy the link and open it with the Graphite Documents App
> or applet)
-
+
-
+
> Handwritten signature
+>
> - Download the PDF source file
> - Fill in items and personal information
> - Print documents
@@ -65,13 +73,15 @@ Apache only accept hand-written signature or [PDF signature
software](https://pd
> - Send to the specified mailbox
> - [icla Sign status
> document](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/ 《icla Sign status
> document》, you can copy the link and open it with the Graphite Documents App
> or applet)
-
+Note: Handwritten signature due to document upgrade, content reference PDF
+
+
-
+
## Email Template {#email-template}
-
+
addressee
@@ -83,7 +93,7 @@ [email protected]
template
```
-Hello Apache Incubator,
+Hello Apache,
I am willing donate the ShenYu project to ASF. The attachment is my ICLA
information. Github account: https://github.com/xxxx.
Thanks !
```
diff --git a/i18n/zh/docusaurus-plugin-content-docs-community/current/4-icla.md
b/i18n/zh/docusaurus-plugin-content-docs-community/current/4-icla.md
index dd55468bd9..fcdd236744 100644
--- a/i18n/zh/docusaurus-plugin-content-docs-community/current/4-icla.md
+++ b/i18n/zh/docusaurus-plugin-content-docs-community/current/4-icla.md
@@ -11,65 +11,74 @@ cover: "/img/architecture/shenyu-framework.png"
## Apache ICLA 签署流程指南
-Apache CLA 全称 Apache Contributor License
Agreement，签署ICLA的目的是定义向ASF贡献的文档，保护知识产权，避免后续法律纠纷。ICLA在官方存档后生效，贡献者方可参与Apache项目。
+Apache CLA 全称 Apache Contributor License Agreement，签署 ICLA 的目的是定义向 ASF
贡献的文档，保护知识产权，避免后续法律纠纷。ICLA 在官方存档后生效，贡献者方可参与 Apache 项目。
-当我们需要签署ICLA时步骤如下:
+如果你已签署过 ICLA，无需发送电子邮件。因为你们已经用自己的公开姓名提交了 ICLA，不需要重复提交了。如果从未签署过 ICLA，请在邮件中注明,
PMC 可以直接申请此账户。
-**1. 打开链接 [官网Licenses](https://www.apache.org/licenses/#clas) 在Contributor
License Agreements 下找到CLAs并进入页面。**
+当我们需要签署 ICLA 时步骤如下:
-
+**1. 打开链接 [官网 Licenses](https://www.apache.org/licenses/#clas) 在 Contributor
License Agreements 下找到 CLAs 并进入页面。**
-**2. 在页面上方我们可以看到两个下载链接，选择ICLA(个人CLA)并下载文件。**
+
-
+**2. 在页面上方我们可以看到两个下载链接，选择 ICLA(个人 CLA)并下载文件。**
-**3. 打开PDF，ICLA需要填写的是两个部分，均需要全英文填写。**
+
+
+**3. 打开 PDF，ICLA 需要填写的是两个部分，均需要全英文填写。**
> 注意事项:
-> - 姓名需要填写拼音，姓与名之间空一格，首字母均为大写，名在前姓氏在后。
-> - Committer相关的签署，则preferred Apache id(s)是必填项。
+>
+> - 务必勾选 check this box only if you entered names with your family name first。
+> - 姓名需要填写拼音，姓与名之间空一格，首字母均为大写，名在前姓氏在后，这不是一个 ID。
+> - 接收邮件的完整地址,不能是工作室或者公司的邮件地址。
+> - 如果使用 gpg 签名,请确保公钥中的电子邮件与表格中的电子邮件一致。
+> - Committer 相关的签署，则 preferred Apache id(s)是必填项。
-
+
-**4.文件最下方的署名。** 官网支持手写或者[PDF签名软件](https://pdf.yozocloud.cn/p/pdfaddsign)
+**4.文件最下方的署名。** 官网支持手写或者[PDF 签名软件](https://pdf.yozocloud.cn/p/pdfaddsign)
-
+
-**5.签署完之后将icla.pdf命令为 `姓名拼音-icla.pdf` 发送到导师提供的邮箱**
+**5.签署完之后将 icla.pdf 命令为 `姓名拼音-icla.pdf` 并电子邮件发送到 `[email protected]` 同时抄送到
`[email protected]`地址。注:不要复制其他人的签署单**。
-**6.邮箱发送成功之后Apache ShenYu 官方社区告知下**
+**6.邮箱发送成功之后 Apache ShenYu 官方社区告知下**
-## 手动签名和PDF软件签名DEMO
+## 手动签名和 PDF 软件签名 DEMO
-> PDF在线签名
-> - 下载PDF源文件
+> PDF 在线签名
+>
+> - 下载 PDF 源文件
> - 填写项目与个人信息
-> - 打开PDF在线签署网址
+> - 打开 PDF 在线签署网址
> - 进入签名
-> - 保存下载已签名pdf
+> - 保存下载已签名 pdf
> - 发送到指定邮箱
-> - 更新石墨[icla 签署状态文档](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/
《icla签署状态表》，可复制链接后用石墨文档 App 或小程序打开)
+> - 更新石墨[icla 签署状态文档](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/ 《icla
签署状态表》，可复制链接后用石墨文档 App 或小程序打开)
-
+
-
+
> 手写签名
-> - 下载PDF源文件
-> - 填写项目与个人信息n
+>
+> - 下载 PDF 源文件
+> - 填写项目与个人信息 n
> - 打印文件
> - 手写签名
-> - 拍照转成**单个pdf** 文件
+> - 拍照转成**单个 pdf** 文件
> - 发送到指定邮箱
-> - 更新石墨[icla 签署状态文档](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/
《icla签署状态表》，可复制链接后用石墨文档 App 或小程序打开)
+> - 更新石墨[icla 签署状态文档](https://shimo.im/sheets/rPqtJcWPDPV9wWPd/MODOC/ 《icla
签署状态表》，可复制链接后用石墨文档 App 或小程序打开)
-
+
-
+
## 邮件发送模板
-
+
+
收件人
@@ -80,7 +89,7 @@ [email protected]
模板
```
-Hello Apache Incubator,
+Hello Apache,
I am willing donate the ShenYu project to ASF. The attachment is my ICLA
information. Github account: https://github.com/xxxx.
Thanks !
```
diff --git a/static/img/shenyu/icla/doc_content.png
b/static/img/shenyu/icla/doc_content.png
deleted file mode 100755
index 630fdf60ea..0000000000
Binary files a/static/img/shenyu/icla/doc_content.png and /dev/null differ
diff --git a/static/img/shenyu/icla/doc_example.png
b/static/img/shenyu/icla/doc_example.png
deleted file mode 100755
index 1eba455a08..0000000000
Binary files a/static/img/shenyu/icla/doc_example.png and /dev/null differ
diff --git a/static/img/shenyu/icla/download.png
b/static/img/shenyu/icla/download.png
deleted file mode 100755
index a8ea7da02e..0000000000
Binary files a/static/img/shenyu/icla/download.png and /dev/null differ
diff --git a/static/img/shenyu/icla/download_v2.0.png
b/static/img/shenyu/icla/download_v2.0.png
new file mode 100644
index 0000000000..445ae9a25b
Binary files /dev/null and b/static/img/shenyu/icla/download_v2.0.png differ
diff --git a/static/img/shenyu/icla/email.png b/static/img/shenyu/icla/email.png
deleted file mode 100755
index 4f1717b3f3..0000000000
Binary files a/static/img/shenyu/icla/email.png and /dev/null differ
diff --git a/static/img/shenyu/icla/email_template_file.png
b/static/img/shenyu/icla/email_template_file.png
deleted file mode 100755
index 04753a6fc5..0000000000
Binary files a/static/img/shenyu/icla/email_template_file.png and /dev/null
differ
diff --git a/static/img/shenyu/icla/email_v2.0.png
b/static/img/shenyu/icla/email_v2.0.png
new file mode 100644
index 0000000000..4ff011f8c7
Binary files /dev/null and b/static/img/shenyu/icla/email_v2.0.png differ
diff --git a/static/img/shenyu/icla/example.png
b/static/img/shenyu/icla/example.png
deleted file mode 100755
index b4ca13e4f2..0000000000
Binary files a/static/img/shenyu/icla/example.png and /dev/null differ
diff --git a/static/img/shenyu/icla/example_v2.0.png
b/static/img/shenyu/icla/example_v2.0.png
new file mode 100644
index 0000000000..49889c2ad4
Binary files /dev/null and b/static/img/shenyu/icla/example_v2.0.png differ
diff --git a/static/img/shenyu/icla/information.png
b/static/img/shenyu/icla/information.png
deleted file mode 100755
index 734d793403..0000000000
Binary files a/static/img/shenyu/icla/information.png and /dev/null differ
diff --git a/static/img/shenyu/icla/information_v2.0.png
b/static/img/shenyu/icla/information_v2.0.png
new file mode 100644
index 0000000000..edf1bd860f
Binary files /dev/null and b/static/img/shenyu/icla/information_v2.0.png differ
diff --git a/static/img/shenyu/icla/page_link.png
b/static/img/shenyu/icla/page_link.png
deleted file mode 100755
index 5d8408d05b..0000000000
Binary files a/static/img/shenyu/icla/page_link.png and /dev/null differ
diff --git a/static/img/shenyu/icla/page_link_v2.0.png
b/static/img/shenyu/icla/page_link_v2.0.png
new file mode 100644
index 0000000000..5bd41ffcba
Binary files /dev/null and b/static/img/shenyu/icla/page_link_v2.0.png differ
diff --git a/static/img/shenyu/icla/pls_sign.png
b/static/img/shenyu/icla/pls_sign.png
deleted file mode 100755
index 3ae4039323..0000000000
Binary files a/static/img/shenyu/icla/pls_sign.png and /dev/null differ
diff --git a/static/img/shenyu/icla/pls_sign_v2.0.png
b/static/img/shenyu/icla/pls_sign_v2.0.png
new file mode 100644
index 0000000000..bb10ed0dd8
Binary files /dev/null and b/static/img/shenyu/icla/pls_sign_v2.0.png differ
diff --git a/static/img/shenyu/icla/sign.png b/static/img/shenyu/icla/sign.png
deleted file mode 100755
index 10bb745a24..0000000000
Binary files a/static/img/shenyu/icla/sign.png and /dev/null differ
diff --git a/static/img/shenyu/icla/sign_v2.0.png
b/static/img/shenyu/icla/sign_v2.0.png
new file mode 100644
index 0000000000..f0af6a2683
Binary files /dev/null and b/static/img/shenyu/icla/sign_v2.0.png differ
diff --git a/static/img/shenyu/icla/write_info.png
b/static/img/shenyu/icla/write_info.png
deleted file mode 100755
index 1da9e7b301..0000000000
Binary files a/static/img/shenyu/icla/write_info.png and /dev/null differ
diff --git a/static/img/shenyu/icla/write_info_v2.0.png
b/static/img/shenyu/icla/write_info_v2.0.png
new file mode 100644
index 0000000000..a3e0a86c4d
Binary files /dev/null and b/static/img/shenyu/icla/write_info_v2.0.png differ
