tweaking issue template

and capitalize...   might be amusing based on MacOSX's case
insensitive filesystem...

2 files changed, 43 insertions, 4 deletions

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..562e43e797
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+## Description
+
+Briefly describe the issue
+
+## Chef Version
+
+Tell us which version of chef-client you are using (see below for Server+ChefDK bugs).
+
+## Platform Version
+
+Tell us which Operating System distribution and version chef-client is running on.
+
+## Replication Case
+
+Tell us what steps to take to replicate your problem.  See [How to create a Minimal, Complete, and Verifiable example](https://stackoverflow.com/help/mcve)
+for information on how to create a good replication case.
+
+## Client Output
+
+The relevant output of the chef-client run or a link to a gist of the entire run, if there is one.
+
+The debug output (chef-client -l debug) may be useful, but please link to a gist, or truncate it.
+
+## Stacktrace
+
+Please include the stacktrace.out output or link to a gist of it, if there is one.
+
+### NOTE: CHEF CLIENT BUGS ONLY
+
+This issue tracker is for the code contained within this repo -- `chef-client`, base `knife` functionality (not
+plugins), `chef-apply`, `chef-solo`, `chef-client -z`, etc.
+
+* [Server issues](https://github.com/chef/chef-server/issues/new)
+* [ChefDK issues](https://github.com/chef/chef-dk/issues/new)
+* Cookbook Issues (see the https://github.com/chef-cookbooks repos or search [Supermarket](https://supermarket.chef.io) or GitHub/Google)
diff --git a/issue_template.md b/issue_template.md
index 5666535174..562e43e797 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -4,7 +4,7 @@ Briefly describe the issue
 
 ## Chef Version
 
-Tell us which version of chef-client you are using (This repo is only for chef-client bugs).
+Tell us which version of chef-client you are using (see below for Server+ChefDK bugs).
 
 ## Platform Version
 
@@ -15,9 +15,9 @@ Tell us which Operating System distribution and version chef-client is running o
 Tell us what steps to take to replicate your problem.  See [How to create a Minimal, Complete, and Verifiable example](https://stackoverflow.com/help/mcve)
 for information on how to create a good replication case.
 
-## Error Output
+## Client Output
 
-The complete output of the chef-client run or a link to a gist of it, if there is one.
+The relevant output of the chef-client run or a link to a gist of the entire run, if there is one.
 
 The debug output (chef-client -l debug) may be useful, but please link to a gist, or truncate it.
 
@@ -27,5 +27,9 @@ Please include the stacktrace.out output or link to a gist of it, if there is on
 
 ### NOTE: CHEF CLIENT BUGS ONLY
 
+This issue tracker is for the code contained within this repo -- `chef-client`, base `knife` functionality (not
+plugins), `chef-apply`, `chef-solo`, `chef-client -z`, etc.
+
 * [Server issues](https://github.com/chef/chef-server/issues/new)
-* Cookbook Issues (see https://github.com/chef-cookbooks repos or search supermarket/github)
+* [ChefDK issues](https://github.com/chef/chef-dk/issues/new)
+* Cookbook Issues (see the https://github.com/chef-cookbooks repos or search [Supermarket](https://supermarket.chef.io) or GitHub/Google)