Merge remote-tracking branch 'upstream/stable' into stable

* upstream/stable:
  (doc) fix order in merge process
  (chocolateyGH-1577) Add cinstm removal to CHANGELOG.md
  (doc) move choco to bottom
  (doc) rename templates
  (doc) update to note choco
  (doc) remove donate
  (doc) update issue templates

.github/ISSUE_TEMPLATE.md

@@ -13,7 +13,7 @@ DO NOT CREATE ISSUES FOR PACKAGES. Read over Submitting Issues.
 
 DO NOT CREATE AN ISSUE FOR A QUESTION - questions are better served as email or chat.
 - email - http://groups.google.com/group/chocolatey
--  chat - https://gitter.im/chocolatey/choco
+- chat - https://gitter.im/chocolatey/choco
 
 DELETE EVERYTHING IN THIS COMMENT BLOCK
 

.github/ISSUE_TEMPLATE/AskQuestion.md

@@ -0,0 +1,18 @@
+---
+name: Ask Question
+about: Do you have a question?
+---
+
+STOP RIGHT HERE - DO NOT CREATE A TICKET FOR A QUESTION ON THIS REPOSITORY
+
+1. Start with https://chocolatey.org/docs/troubleshooting (Troubleshooting) and https://chocolatey.org/docs/chocolatey-faqs (FAQs) to see if your question or issue already has an answer. You can also explore https://chocolatey.org/docs (which are pretty comprehensive, but not always the most searchable).
+2. If not found or resolved, please see https://chocolatey.org/support to see what avenues are available to you based on whether you are an open source user or a licensed customer (have a commercial edition).
+
+
+The best routes for getting questions answered when the documentation doesn't serve what you need is the mailing list or in chat:
+- email - http://groups.google.com/group/chocolatey
+- chat - https://gitter.im/chocolatey/choco
+
+
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication

.github/ISSUE_TEMPLATE/ReportGUIIssue.md

@@ -0,0 +1,14 @@
+---
+name: Chocolatey GUI - Report Issue / Suggest Feature
+about: Did you find unexpected behavior?
+---
+
+STOP RIGHT HERE - DO NOT CREATE A TICKET FOR Chocolatey GUI ON THIS REPOSITORY
+
+This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco. 
+
+For Chocolatey GUI, you will need to head over to https://github.com/chocolatey/ChocolateyGUI and file a ticket there.
+
+
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication

.github/ISSUE_TEMPLATE/ReportPackageIssue.md

@@ -0,0 +1,19 @@
+---
+name: Package - Report Issue / Suggest Missing Package / Package Outdated
+about: Something went wrong with an installation? Want a package to be added to the community repository?
+---
+
+STOP RIGHT HERE - DO NOT CREATE A TICKET FOR PACKAGES ON THIS REPOSITORY
+
+This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco. For a package failure, typically you would be reporting an issue with a package on the community package repository, which is not what this repository represents. In fact, the community repository and all of its packages represents about 5% of the packages in existence and less than half of the usage of choco itself. 
+
+  In other words Chocolatey != Chocolatey.org Packages.
+
+For all things packages, you have two routes:
+
+1. If you are having issue with a package or you want to see an enhancement, please see https://chocolatey.org/docs/package-triage-process (Package Triage Process / Becoming a maintainer of existing packages).
+2. If you are looking for packages to be added to the community package repository (aka https://chocolatey.org/packages), please see https://chocolatey.org/docs/package-triage-process#package-request-package-missing (Package Requests).
+
+
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication

.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md

@@ -0,0 +1,14 @@
+---
+name: Website - Report Issue / Suggest Feature
+about: Something weird about https://chocolatey.org or do you want to suggest a feature?
+---
+
+STOP RIGHT HERE - DO NOT CREATE A TICKET FOR THE WEBSITE ON THIS REPOSITORY
+
+This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco.
+
+For Chocolatey Gallery aka Chocolatey Community Package Repository, you will need to head over to https://github.com/chocolatey/chocolatey.org and file a ticket there.
+
+
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication

.github/ISSUE_TEMPLATE/SecurityDisclosure.md

@@ -0,0 +1,8 @@
+---
+name: Security Disclosure / Report
+about: Found a security issue?
+---
+
+STOP RIGHT HERE - DO NOT CREATE A TICKET FOR A SECURITY FINDING IN THE OPEN (HERE OR IN ANY COMMUNITY)
+
+Security reports should never start out in the open. Please follow up directly with the team if you have a contact. If not you can always start with the information at https://chocolatey.org/security to see instructions on how to provide the disclosure. Thank you!

.github/ISSUE_TEMPLATE/zChocoFeatureRequest.md

@@ -0,0 +1,10 @@
+---
+name: Choco.exe - Enhancement / Feature Request
+about: How can we make Chocolatey work better for you? Is there additional functionality you would love us to consider?
+---
+
+<!--
+Please observe https://github.com/chocolatey/choco/blob/master/CONTRIBUTING.md guidelines prior to creating your issue.
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
+-->

.github/ISSUE_TEMPLATE/zChocoReportIssue.md

@@ -0,0 +1,42 @@
+---
+name: Choco.exe - Report Issue
+about: Did you find unexpected behavior?
+---
+
+Ensure you have read over Submitting Issues -
+https://github.com/chocolatey/choco#submitting-issues
+
+Please check to see if your issue already exists with a quick search of the issues. Start with one relevant term and then add if you get too many results.
+
+NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
+-->
+
+### What You Are Seeing?
+
+### What is Expected?
+
+### How Did You Get This To Happen? (Steps to Reproduce)
+
+### Output Log
+<!--
+When including the log information, please ensure you have run the command with --debug --verbose. It provides important information for determining an issue
+
+- Make sure there is no sensitive data shared.
+- We need ALL output, not just what you may believe is relevant.
+- We need ALL OUTPUT (including the configuration information), see https://gist.github.com/ferventcoder/b1300b91c167c8ac8205#file-error-txt-L1-L41 for what we need.
+- If it is hard to reproduce with debug/verbose, the log file already logs with those parameters, just grab the relevant section from the log file (in the logs directory of your Chocolatey install).
+-->
+
+
+<details>
+<summary>Full Log Output</summary>
+
+<p>
+
+~~~sh
+PLACE LOG CONTENT HERE - WE NEED _ALL_ DETAILED OUTPUT BASED ON THE ABOVE TO BE ABLE TO PROVIDE SUPPORT (YOU WILL FIND THAT IN THE $env:ChocolateyInstall\logs\chocolatey.log between the `=====`)
+~~~
+
+</p>
+
+</details>

CHANGELOG.md

@@ -892,7 +892,7 @@ We'll try to capture everything here that you should know about. Please call `ch
    1. Read the above about apikey changes
    2. Read above about dependency resolution changes.
  * **Deprecated/Removed Commands:**
-   1. `installmissing` has been removed. It was deprecated awhile ago, so this should not be a surprise.
+   1. `installmissing` and 'cinstm' have been removed. They were deprecated awhile ago, so this should not be a surprise. For equivalent functionality see the plain install/cinst commands.
    2. `choco version` has been deprecated and will be removed in v1. Use `choco upgrade pkgName --noop` or `choco upgrade pkgName -whatif` instead.
    3. `Write-ChocolateySuccess`, `Write-ChocolateyFailure` have been deprecated.
    4. `update` is now `upgrade`. `update` has been deprecated and will be removed/replaced in v1. Update will be reincarnated later for a different purpose. **Hint**: It rhymes with smackage pindexes.

COMMITTERS.md

@@ -73,8 +73,8 @@ Because we ask contributors to target master, sometimes a fix/enhancement may ne
  * `git checkout pr<github_pull_id>`
  * `git rebase --onto stable master` - this uses the local branch, starts with latest stable and reapplies the commits from the branch to it, removing all commits that were only on the master.
  * `build.bat` - build and test
+ * Any additional changes or testing here.
  * `git checkout stable`
- * Any addtional changes or testing here.
  * `git merge pr<github_pull_id> --log --no-ff`
  * `git branch -d pr<github_pull_id>`
  * `git checkout master`

README.md

@@ -44,7 +44,6 @@ Please make sure you've read over and agree with the [etiquette regarding commun
 
 ## Support Chocolatey!
  * Purchase [Chocolatey Pro / Chocolatey for Business](https://chocolatey.org/pricing#compare)
- * Donate [![](https://img.shields.io/gratipay/Chocolatey.svg)](https://www.gratipay.com/Chocolatey/)
 
 ## See Chocolatey In Action
 Chocolatey FOSS install showing tab completion and `refreshenv` (a way to update environment variables without restarting your shell):
@@ -73,7 +72,7 @@ Please see the [docs](https://chocolatey.org/docs)
 Give `choco.exe -?` a shot (or `choco.exe -h`). For specific commands, add the command and then the help switch e.g. `choco.exe install -h`.
 
 ### Requirements
-* .NET Framework 4.0
+* .NET Framework 4.0+
 * PowerShell 2.0+
 * Windows Server 2003+ / Windows 7+