Merge branch 'master' of github.com:chronzerg/ranger

1 files changed, 21 insertions, 38 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b7baa192..468f0991 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,55 +1,38 @@
-<!-- Provide a descriptive summary of the issue in the title above -->
-<!-- First verify that the issue hasn't already been reported -->
-<!-- Also test if the latest release and master branch are affected too -->
-
-#### ISSUE TYPE
-<!-- Pick one and delete the rest -->
-- Bug report
-- Improvement/feature request
-
-#### RUNTIME ENVIRONMENT
-<!-- Details of your runtime environment -->
-<!-- Retrieve Python/ranger version and locale with `ranger -\-version` -->
+<!--
+    Thank you for contributing to ranger by opening this issue.
+    Please check through this list, so you can be as helpful as possible:
+
+    1. Was this issue already reported?  Please do a quick search.
+    2. Maybe the problem is solved in the current master branch already?
+       Simply clone ranger's git repository and run ./ranger.py to find out.
+    3. Provide all the relevant information, as outlined in this template.
+       Feel free to remove any sections you don't need.
+-->
+
+#### Runtime Environment
+<!-- Retrieve Python/ranger version and locale with `ranger --version` -->
 - Operating system and version: 
 - Terminal emulator and version: 
 - Python version: 
 - Ranger version/commit: 
 - Locale: 
 
-#### EXPECTED BEHAVIOR
-<!-- Bug: What should happen? -->
-<!-- Request: How should it work? -->
+#### Current Behavior
 
+#### Expected Behavior
 
-#### CURRENT BEHAVIOR
-<!-- Bug: How is it different from the expected behavior? -->
-<!-- Request: How does it change the current behavior? -->
+#### Context
+<!-- How has this issue affected you?  What are you trying to accomplish? -->
 
+#### Possible Solutions
 
-#### CONTEXT
-<!-- How has this issue affected you? -->
-<!-- What are you trying to accomplish? -->
-
-
-#### POSSIBLE SOLUTIONS
-<!-- Bug: How should it be fixed? -->
-<!-- Request: How should it be implemented? -->
-
-
-#### STEPS TO REPRODUCE<!-- For bugs -->
-<!-- List unambiguous steps to reproduce the bug -->
+#### Steps to reproduce
 1. 
 2. 
 3. 
-4. 
-5. 
 
-#### TRACEBACK<!-- For crashes -->
-<!-- Run ranger in debug mode -->
-<!-- Paste between quotes -->
+#### Traceback
+<!-- If ranger crashes, paste the traceback in the quotes below. -->
 ```
 
 ```
-
-#### IMAGES / VIDEOS<!-- Only if relevant -->
-<!-- Link or embed images and videos of screenshots, sketches etc. -->