From 2b475685ebc1b1237184cc5b1fb479038acc6e55 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Wed, 19 May 2021 18:30:15 +0800
Subject: [PATCH] feat(github): update github PR and issue template

---
 .github/ISSUE_TEMPLATE/bug_report.md |  5 ++++-
 .github/pull_request_template.md     | 21 +++++++++++++--------
 README.md                            |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3a03208ae0..f716619cc7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,6 +10,9 @@ assignees: ''
 **What happened**:
 
 **Environment**:
-- OS (e.g: `cat /etc/os-release`):
+
+- OS (e.g. `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
+<!--
 - Version (e.g. `kubectl get oc -n onecloud  -o yaml | grep -C 3 version`):
+-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cade6ceb0c..c201d395eb 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,15 +1,20 @@
-**这个 PR 实现什么功能/修复什么问题**:
+**What this PR does / why we need it**:
 
 <!--
-- [ ] 功能、bugfix描述
-- [ ] 冒烟测试
-- [ ] 单元测试编写
+- [ ] Smoke testing completed
+- [ ] Unit test written
 -->
 
-**是否需要 backport 到之前的 release 分支**:
+** Does this PR need to be backport to the previous release branch?**:
 
 <!--
-如果不需要，填写 "NONE".
-如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
-- release/3.2
+If no, just write "NONE".
+
+If don't know, write "UNKNOWN", and let the reviewer decide.
+
+If yes, write the release branches name in the below format and submit the related cherry-pick PR:
+- release/3.7
+- release/3.6
+
+Take a look at "https://docs.yunion.io/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR. 
 -->
diff --git a/README.md b/README.md
index 8f008ea2c6..f4742a6f49 100644
--- a/README.md
+++ b/README.md
@@ -52,4 +52,4 @@ You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](
 
 ## License
 
-Apache License 2.0. See [LICENSE](./LICENSE) 。
+Apache License 2.0. See [LICENSE](./LICENSE).