resolve conflict

Author: theJasonHelmick

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,35 @@
+---
+name: Documentation Issue 📚
+about: Problems with PowerShell documentation
+title: "Documentation Issue"
+labels: issue-question
+assignees: ''
+
+---
+
+# Documentation Issue
+
+<!--
+Use this template to report issues with documentation. This can include typos, technical and factual
+errors, grammar, spelling, formatting, presentation, etc.
+
+Be sure to change the issue title. Titles should be brief and meaningful.
+-->
+
+## Details of the issue
+
+- URL to the article (Docs or GitHub URL):
+- Is the issue version specific (Y/N - include version info) :
+  - [ ] Impacts 7 document
+  - [ ] Impacts 6 document
+  - [ ] Impacts 5.1 document
+  - [ ] Impacts 5.0 document
+  - [ ] Impacts 4.0 document
+  - [ ] Impacts 3.0 document
+- Is the issue specific to a platform (Y/N - Win/macOS/Linux):
+
+Description of the issue:
+
+<!--
+Enter your problem description below. Use markdown code fences for example code and output.
+-->

.github/ISSUE_TEMPLATE/Documentation_Issue.md

@@ -0,0 +1,32 @@
+---
+name: New Document Request/Idea 🚀
+about: Suggest a new document or major rewrite of an existing one
+title: "Document Request"
+labels: issue-doc-idea
+assignees: ''
+
+---
+
+# Summary of the new document or enhancement
+
+<!--
+A clear and concise description of purpose the new document. Why it is needed? What gap is it
+filling? Who is the intended audience? What is the intended scenario being addressed?
+
+Try formulating it in user story style (if applicable):
+
+'As a user I need a document about X so that I can Y.' with X being the problem or scenario and Y
+being the purpose and/or target audience for the document.
+
+Be sure to change the issue title. Titles should be brief and meaningful.
+-->
+
+Details of requested document:
+
+- Proposed title:
+- Propose location in the TOC:
+- Target audience:
+- Purpose or scenario:
+  _or_
+  Proposed changes/additions to existing article:
+- List of related articles to link to:

.github/ISSUE_TEMPLATE/New_Document_Request.md

@@ -0,0 +1,14 @@
+---
+name: PowerShell Product Issue 🐛
+about: PowerShell behavior issues should be filed at https://github.com/PowerShell/PowerShell/issues/new/choose
+title: Issue title
+labels: issue-product-feedback
+assignees: ''
+
+---
+
+# Product Issue
+
+If this issue is that the behavior is documented incorrectly then use the **Doc Bug Report**
+template. Otherwise, issues about PowerShell behavior should be filed in the
+[PowerShell](https://github.com/PowerShell/PowerShell/issues/new/choose) code repository.

.github/ISSUE_TEMPLATE/Product_Issue.md

@@ -0,0 +1,27 @@
+---
+name: Support Question ❓
+about: Try asking in the PowerShell Slack channel first. For official support, refer to the PowerShell Support Lifecycle at https://aka.ms/pslifecycle
+title: "Support Question"
+labels: issue-question
+assignees: ''
+
+---
+
+# Support Question
+
+## Official support
+
+[PowerShell Support Lifecycle](https://aka.ms/pslifecycle)
+
+## Community Resources
+
+[Slack][powershell-slack] and [Discord][powershell-discord] Community Chat - Interactive chat with
+other PowerShell enthusiasts. Both Slack and Discord are bridged via a bot and can seamlessly talk
+to each other.
+
+[StackOverflow.com](https://stackoverflow.com/questions/tagged/powershell) and
+[PowerShell.org Forum](https://powershell.org/forums/) - Search or post new general PowerShell usage
+questions.
+
+[powershell-slack]: https://join.slack.com/t/powershell/shared_invite/enQtMzA3MDcxNTM5MTkxLTBmMWIyNzhkYzVjNGRiOTgxZmFlN2E0ZmVmOWU5NDczNTY2NDFhZjFlZTM1MTZiMWIzZDcwMGYzNjQ3YTRkNWM
+[powershell-discord]: https://discordapp.com/invite/AtzXnJM

.github/ISSUE_TEMPLATE/Support_Question.md

@@ -1,23 +1,30 @@
-<!--
-If this doc issue is for content OUTSIDE of /reference folder (such as DSC, WMF etc.), there is no need to fill this template. Please delete the template before submitting the PR.
+# PR Summary
+<!-- Summarize your changes and list related issues here -->
 
-If this doc issue is for content UNDER /reference folder, please fill out this template:
+## PR Context
+<!--
+There is a numbered folder for each version of the PowerShell cmdlet reference. Changes to cmdlet
+reference should be made to all versions where applicable. The /docs-conceptual folder tree does not
+have version folders.
 -->
-Version(s) of document impacted
-------------------------------
+
+Version(s) of documents impacted
+
 - [ ] Impacts 7 document
 - [ ] Impacts 6 document
 - [ ] Impacts 5.1 document
 - [ ] Impacts 5.0 document
 - [ ] Impacts 4.0 document
 - [ ] Impacts 3.0 document
 
-<!--
-If the PR is fixing only a subset of document version(s), please explain why by picking appropriate items in the list below
-If the PR is fixing all the document version(s), please delete the list/options below
--->
-Reason(s) for not updating all version of documents
---------------------------------------------------
-- [ ] The documented feature was introduced in version (list version here) of PowerShell
-- [ ] This issue only shows up in version (list version(s) here) of the document
-- [ ] This PR partially fixes the issue, and issue #<insert here> tracks the remaining work
+## PR Checklist
+
+- [ ] I have read the [contributors guide(https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/CONTRIBUTING.md)]
+  and followed the style and process guidelines
+- [ ] PR has a meaningful title
+- [ ] PR is targetted at the _staging_ branch
+- [ ] All relevant versions updated
+- [ ] Includes reference to related issues and PRs - see [Closing issues using keywords](https://help.github.com/en/articles/closing-issues-using-keywords).
+- [ ] This PR is ready to merge and is not **Work in Progress**
+  - If the PR is work in progress, please add the prefix `WIP:` or `[ WIP ]` to the beginning of the
+    title and remove the prefix when the PR is ready.