From 2edd4d11f24ccbfd572dff61934e514e5ec342c5 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Wed, 3 May 2017 18:51:50 -0400
Subject: [PATCH] Revise issue template

This commit revises the issue template, hoping to make it clearer that
following the guidelines is a really good thing to do.

Relates #24470
---
 .github/ISSUE_TEMPLATE.md | 43 +++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7822d8ef2b3..ea89d18ca8a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,27 +1,40 @@
 <!--
-GitHub is reserved for bug reports and feature requests. The best place
-to ask a general question is at the Elastic Discourse forums at
-https://discuss.elastic.co. If you are in fact posting a bug report or
-a feature request, please include one and only one of the below blocks
-in your new issue. Note that whether you're filing a bug report or a
-feature request, ensure that your submission is for an
-[OS that we support](https://www.elastic.co/support/matrix#show_os).
-Bug reports on an OS that we do not support or feature requests
-specific to an OS that we do not support will be closed.
+
+**Please read the guidelines below.**
+
+If you follow these guidelines, you will help make it more likely that you
+achieve the outcome that you are looking for. If you do not follow the these
+guidelines you are going to waste your time and you are going to waste our
+time.
+
 -->
 
 <!--
-If you are filing a bug report, please remove the below feature
-request block and provide responses for all of the below items.
+GitHub is reserved for bug reports and feature requests. The best place to ask
+a general question is at the Elastic [forums](https://discuss.elastic.co). GitHub
+is not the place for general questions.
+
+If you are in fact posting a bug report or a feature request, please include
+one and only one of the below blocks in your new issue. Note that whether
+you're filing a bug report or a feature request, ensure that your submission is
+for an [OS that we support](https://www.elastic.co/support/matrix#show_os). Bug
+reports on an OS that we do not support or feature requests specific to an OS
+that we do not support will be closed. Bug reports that do not follow the below
+template are at risk of being closed.
+-->
+
+<!--
+If you are filing a bug report, please remove the below feature request block
+and provide responses for all of the below items.
 -->
 
 **Elasticsearch version**:
 
 **Plugins installed**: []
 
-**JVM version**:
+**JVM version** (`java -version`):
 
-**OS version**:
+**OS version** (`uname -a` if on a Unix-like system):
 
 **Description of the problem including expected versus actual behavior**:
 
@@ -33,8 +46,8 @@ request block and provide responses for all of the below items.
 **Provide logs (if relevant)**:
 
 <!--
-If you are filing a feature request, please remove the above bug
-report block and provide responses for all of the below items.
+If you are filing a feature request, please remove the above bug report block
+and provide responses for all of the below items.
 -->
 
 **Describe the feature**: