From b9bdc99c1d0632ccdbf434aae019d87659408443 Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Sun, 8 Sep 2019 12:14:59 +0200
Subject: [PATCH 1/4] move pull request template

---
 .github/PULL_REQUEST_TEMPLATE/.keep                               | 0
 .../PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md                | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .github/PULL_REQUEST_TEMPLATE/.keep
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md (100%)

diff --git a/.github/PULL_REQUEST_TEMPLATE/.keep b/.github/PULL_REQUEST_TEMPLATE/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md

From 444029699a5c785edf4edc0577e867cfc2615f25 Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Sun, 8 Sep 2019 12:30:44 +0200
Subject: [PATCH 2/4] update the issue template

---
 .../installation-and-configuration-issues.md    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
index 9a6c731b..57db1984 100644
--- a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
+++ b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
@@ -4,4 +4,19 @@ about: Installation and configuration assistance
 
 ---
 
-If you are having issues with installation or configuration, you may ask for help on the JupyterHub gitter channel or file an issue here.
+<!---
+If you are reading this message, you have probably already searched the existing
+GitHub issues for JupyterHub. If you haven't tried a search, we encourage you to do so.
+
+If you are unsure where to ask your question (Jupyter, JupyterHub, JupyterLab, etc.),
+please ask on our [Discourse Q&A channel](https://discourse.jupyter.org/c/questions).
+
+If you have a quick question about JupyterHub installation or configuratation, you
+may ask on the [JupyterHub gitter channel](https://gitter.im/jupyterhub/jupyterhub).
+
+:sunny: Please be patient. We are volunteers and will address your question when we are able. :sunny:
+
+If after trying the above steps, you still have an in-depth installation or
+configuration question, such as a possible bug, please file an issue below and include
+any relevant details.
+--->

From 0bcd6adde6a65eccc567a278f6ef9feb79030e69 Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Sun, 8 Sep 2019 12:39:11 +0200
Subject: [PATCH 3/4] Edit bug report

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 36 ++++++++++---------
 .../installation-and-configuration-issues.md  |  2 +-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 476d8bb6..f5540a34 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,37 +1,39 @@
 ---
-name: Bug report
+name: Issue report
 about: Create a report to help us improve
 
 ---
 
+<!---
 Hi! Thanks for using JupyterHub.
 
-If you are reporting an issue with JupyterHub, please use the [GitHub issue](https://github.com/jupyterhub/jupyterhub/issues) search feature to check if your issue has been asked already. If it has, please add your comments to the existing issue.
+If you are reporting an issue with JupyterHub, please use the GitHub search feature to check if your issue has been asked already. If it has, please add your comments to the existing issue.
+
+Some tips:
+- Running `jupyter troubleshoot` from the command line, if possible, and posting
+its output would also be helpful.
+- Running JupyterHub in `--debug` mode (`jupyterhub --debug` can also be helpful for troubleshooting.
+--->
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+<!---Add description here--->
+
 **To Reproduce**
-Steps to reproduce the behavior:
+<!---
+Please share the steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+--->
 
 **Expected behavior**
+<!---
 A clear and concise description of what you expected to happen.
+--->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
-
-- Running `jupyter troubleshoot` from the command line, if possible, and posting
-its output would also be helpful.
-- Running in `--debug` mode can also be helpful for troubleshooting.
+**Compute Information**
+ - Operating System
+ - JupyterHub Version [e.g. 22]
diff --git a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
index 57db1984..2505d1d8 100644
--- a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
+++ b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
@@ -1,5 +1,5 @@
 ---
-name: Installation and configuration issues
+name: Installation and configuration questions
 about: Installation and configuration assistance
 
 ---

From e07aaa603ae098132eb9996b55c0aa659277547f Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Sun, 8 Sep 2019 15:59:58 +0200
Subject: [PATCH 4/4] fix typo found by @blink1073 review

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f5540a34..dde161d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,7 +12,7 @@ If you are reporting an issue with JupyterHub, please use the GitHub search feat
 Some tips:
 - Running `jupyter troubleshoot` from the command line, if possible, and posting
 its output would also be helpful.
-- Running JupyterHub in `--debug` mode (`jupyterhub --debug` can also be helpful for troubleshooting.
+- Running JupyterHub in `--debug` mode (`jupyterhub --debug`) can also be helpful for troubleshooting.
 --->
 
 **Describe the bug**