From 81e9416d1306d541bcdb9f7f64ed1eeac5fac3da Mon Sep 17 00:00:00 2001
From: Baohua Yang <yangbaohua@gmail.com>
Date: Thu, 23 Nov 2017 09:59:40 +0800
Subject: [PATCH] Update templates for github issue and pr

---
 .github/ISSUE_TEMPLATE.md        | 43 ++++++++++----------------------
 .github/PULL_REQUEST_TEMPLATE.md | 23 +++++++++++------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index aefc8b0..4b6faa1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,47 +1,30 @@
-### your OS
+* [ ] Have u googled the problem? If no, pls do that first!
 
-<!--请选择你的系统版本-->
-<!--select your os version-->
+### Environment
+<!--请提供环境信息，包括操作系统版本等-->
+<!--Provides env info like OS version-->
 
 * [x] Linux
-
    * [x] CentOS 7
-
-   * [ ] Ubuntu 14.04
-
    * [ ] Ubuntu 16.04
-
-   * [ ] Ubuntu 17.04
-
    * [ ] Ubuntu 17.10
-
    * [ ] CoreOS
-
-   * [ ] Debian 7.7
-
    * [ ] Debian 8
-
    * [ ] Debian 9
-
-
-* [ ] macOS
-
+* [ ] MacOS
 * [ ] Windows 10
+* [ ] Others (Pls describe below)
 
-### Docker CE Version
-
-<!--如果你的 Docker 版本低于 17.09 请尽可能升级到该版本-->
-<!--if Docker version under 17.09, please upgrade Docker to 17.09-->
+### Docker Version
+<!--如果你的 Docker 版本低于 17.0 请尽可能升级到该版本-->
+<!--if Docker version under 17.0, please upgrade Docker to 17.09-->
 
 * [x] 17.11 edge
-
 * [ ] 17.09 stable
-
 * [ ] 1.13.0
+* [ ] Before 1.13.0
 
-* [ ] 1.8.0
+### Problem Description
+<!--描述你的问题，请贴出操作步骤，终端报错日志-->
+<!--describe problem with detailed steps and logs-->
 
-### Problem description
-
-<!--描述你的问题，请贴出终端报错截图-->
-<!--describe problem-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 72fa318..460deb2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,20 @@
-<!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
-    for this project's contribution guidelines. Remove these comments
-    as you go. -->
+<!--
+    Thanks for your contribution. 
+    See [CONTRIBUTING](CONTRIBUTING.md) for contribution guidelines.
+-->
 
-### Proposed changes (optional)
+### Proposed changes (Mandatory)
 
-<!--Tell us what you did and why-->
+<!--
+    Tell us what you did and why: 
 
-### Fix issues (optional)
+    One line short description
+    
+    And details in other paragraphs.
+-->
 
-<!--Tell us what issues you fixed-->
+### Fix issues (Optional)
+
+<!--
+    Tell us what issues you fixed, e.g., fix #123 
+-->