From a04c45a2b6059957c22fc51c6795c698b6baa4b3 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 27 Apr 2016 13:36:37 -0500
Subject: [PATCH 1/2] Make the issue template more robust.

This makes the issue template more robust, making check boxes so users can submit and check or check as they go.  It also starts using HTML comments so that directions for the users aren't always displayed to us (gotta love Markdown.) And provides the users with more hints on what we would like from them when filing a ticket.
---
 .github/ISSUE_TEMPLATE.md | 74 +++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 614de1c9..125a8516 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,20 +1,64 @@
-###### What version of Jekyll are you using (`jekyll -v`)?
+<!--
+  Hi! Thanks for considering to file a bug with Jekyll.  Please take the
+  the basic questions (convert `[ ]` into `[x]` to check it (or submit and check.)
+  If are no need for certain fields like output and redirection, please delete
+  those headers before submitting.  We know not all tickets require those
+  steps.  Otherwise, please try to be as detailed as possible.
+  
+  If you are unsure this is a bug in Jekyll, or this is a bug caused
+  by a plugin that isn't directly related to Jekyll, or if this is just
+  a generic usage question, please consider asking your question at
+  https://talk.jekyllrb.com where non-bug questions go.
+  
+  Thanks!
+-->
+
+- [ ] I believe this to be a bug, not a question about using Jekyll.
+- [ ] I Read the CONTRIBUTION file at https://github.com/jekyll/jekyll/blob/master/.github/CONTRIBUTING.markdown
+- [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages`
+
+---
+
+- [ ] I am on ***MacOS*** 10+
+- [ ] I am on ***Ubuntu*** GNU/Linux
+- [ ] I am on ***Fedora*** GNU/Linux
+- [ ] I am on ***Arch*** GNU/Linux
+- [ ] I am on ***Other*** GNU/Linux
+- [ ] I am on ***Windows*** 10+
 
 
+<!--
+  Other GNU/Linux includes Scientific GNU/Linux, CentOS GNU/Linux, and others.
+  If you are on a minor sub-distro (such as ElementaryOS which does not diverge from
+  Ubuntu much, please check the parent distro. Kubuntu, Edubuntu, Lubuntu should
+  also be flagged as Ubuntu as their packages come from upstream Ubuntu.
+-->
 
-###### What operating system are you using?
-
-
-
-###### What did you do?
-(Please include the content causing the issue, any relevant configuration settings, and the command you ran)
-
-
-
-###### What did you expect to see?
-
-
-
-###### What did you see instead?
+---
+
+- [ ] I was trying to install.
+- [ ] There is a broken Plugin API.
+- [ ] I was trying to build.
+- [ ] It was another bug.
+
+## My Reproduction Steps
+
+<!--
+  Insert the steps you took to for this problem to exist.  Such as the
+  directories you created and, the full command you ran, and include any
+  plugins you have installed, this is very important.
+  
+  If your steps are complicated, you can also submit a Github
+  repository (please no zips, they will be removed and rejected by maintainers,)
+  and just supply a command for us to reproduce it ourselves.
+-->
+
+## The Output I Got
+
+<!-- 
+  Insert the output from the command.  Alter it as little as you can.
+  The minimum should be personal information.  Though we normally don't log
+  anything like that so there shoul be no need to alter it.
+-->
 
 

From 035352feff52725656a8114f4ff85a7fae161bd2 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Thu, 28 Apr 2016 04:28:15 -0500
Subject: [PATCH 2/2] Update the ISSUE_TEMPLATE.md file.

* Link to jekyllrb.com as @parkr suggested.
* Add a few more directions and hints for Github Pages users who have errors.
* Add words that were missing and made stuff make no sense.
---
 .github/ISSUE_TEMPLATE.md | 52 +++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 125a8516..5265bea4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
 <!--
-  Hi! Thanks for considering to file a bug with Jekyll.  Please take the
-  the basic questions (convert `[ ]` into `[x]` to check it (or submit and check.)
-  If are no need for certain fields like output and redirection, please delete
-  those headers before submitting.  We know not all tickets require those
-  steps.  Otherwise, please try to be as detailed as possible.
+  Hi! Thanks for considering to file a bug with Jekyll.  Please take the time to
+  answer the basic questions. You can convert `[ ]` into `[x]` to check boxes (or submit
+  and check.) If there is no need for certain fields like output and redirection, please delete
+  those headers before submitting.  We know not all tickets require those steps.
+  Otherwise, please try to be as detailed as possible.
   
   If you are unsure this is a bug in Jekyll, or this is a bug caused
   by a plugin that isn't directly related to Jekyll, or if this is just
@@ -14,18 +14,18 @@
 -->
 
 - [ ] I believe this to be a bug, not a question about using Jekyll.
-- [ ] I Read the CONTRIBUTION file at https://github.com/jekyll/jekyll/blob/master/.github/CONTRIBUTING.markdown
 - [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages`
+- [ ] I Read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/
+- [ ] This is a feature request.
 
 ---
 
-- [ ] I am on ***MacOS*** 10+
-- [ ] I am on ***Ubuntu*** GNU/Linux
-- [ ] I am on ***Fedora*** GNU/Linux
-- [ ] I am on ***Arch*** GNU/Linux
-- [ ] I am on ***Other*** GNU/Linux
-- [ ] I am on ***Windows*** 10+
-
+- [ ] I am on (or have tested on) ***Mac OS*** 10+
+- [ ] I am on (or have tested on) ***Debian/Ubuntu*** GNU/Linux
+- [ ] I am on (or have tested on) ***Fedora*** GNU/Linux
+- [ ] I am on (or have tested on) ***Arch*** GNU/Linux
+- [ ] I am on (or have tested on) ***Other*** GNU/Linux
+- [ ] I am on (or have tested on) ***Windows*** 10+
 
 <!--
   Other GNU/Linux includes Scientific GNU/Linux, CentOS GNU/Linux, and others.
@@ -38,13 +38,28 @@
 
 - [ ] I was trying to install.
 - [ ] There is a broken Plugin API.
+- [ ] I had an error on Github Pages, and I have not tested locally.
+- [ ] I had an error on Github Pages, and Github Support said it was a Jekyll Bug.
+- [ ] I had an error on Github Pages and I did not test it locally.
 - [ ] I was trying to build.
 - [ ] It was another bug.
 
 ## My Reproduction Steps
 
 <!--
-  Insert the steps you took to for this problem to exist.  Such as the
+  If this error occured on Github Pages, please try to provide us with logs,
+  and look at them yourself, to determine if this is an actual Jekyll bug. In
+  the event you are unsure, file a ticket, however, when you do please provide
+  the logs (strip them of personal information.)
+  
+  If you have trouble finding your logs, please email support@github.com and
+  they will happily help you. If you cannot find logs, please try your best to
+  replicate it locally because we cannot fix a problem if we do not know
+  exactly what caused it, or within a relatively close distance.
+-->
+
+<!--
+  Insert the steps you took to for this problem to exist. Such as the
   directories you created and, the full command you ran, and include any
   plugins you have installed, this is very important.
   
@@ -53,12 +68,11 @@
   and just supply a command for us to reproduce it ourselves.
 -->
 
-## The Output I Got
+## The Output I Wanted
 
 <!-- 
-  Insert the output from the command.  Alter it as little as you can.
-  The minimum should be personal information.  Though we normally don't log
-  anything like that so there shoul be no need to alter it.
+  Insert the output from the command. Alter it as little as you can.
+  The minimum should be personal information. Though we normally don't log
+  anything like that so there should be no need to alter it.
 -->
 
-