Updated contributing accepted PRs for all versions and basic template

GH2917 - Add note on accepted PRs in code and metadata for template

Author: Lori Krell

_includes/contributor/2-1-end.md

@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-warning}
+**v2.1 End of Contribution:**
+As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting  contributions for the [v2.2](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html) and [v2.3](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html) release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.

_includes/contributor/2-2-submission.md

@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-info}
+**v2.2 Contribution Notice:**
+As of September 17, 2018, in an effort to keep 2.2 and 2.3 releases aligned, we will only accept pull requests to 2.2-develop that contain changes already existing in 2.3-develop. We recommend submitting pull requests to 2.3-develop then [back porting](#porting) the changes to 2.2-develop.

_includes/contributor/2-3-submission.md

@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-info}
+**v2.3 Contribution Notice:**
+As of September 17, 2018, in an effort to keep 2.2 and 2.3 releases aligned, we accept pull requests to 2.3-develop and encourage [back ports](#porting) to 2.2-develop. We no longer accept pull requests to the v2.1 or v2.0 release lines to focus all development efforts on v2.3 and v2.2.

_includes/contributor/pull-request-table.md

@@ -0,0 +1,5 @@
+|     |                 Fix for Existing Issue                 |                     Test Coverage                      |                      Refactoring                       |                      New Feature                       |                      Code Cleanup                      |
+|:----|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|
+| 2.1 | ![No]({{site.baseurl}}/common/images/red-x.png) | ![No]({{site.baseurl}}/common/images/red-x.png) |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |
+| 2.2 | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |
+| 2.3 | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) |

guides/v2.1/contributor-guide/contributing.md

@@ -1,9 +1,10 @@
 ---
 group: contributor-guide
 title: Code Contributions
-redirect_from: /guides/v2.0/contributor-guide/contributing.html
 ---
 
+{% include contributor/2-1-end.md %}
+
 The following topics are included in this guide:
 
 - [Contribute to Magento 2 code](#contribute)
@@ -49,13 +50,11 @@ Submit feature requests or enhancement suggestions to the new [Magento 2 Feature
 
 ## Accepted pull requests and ported code {#rules}
 
+{% include contributor/2-1-end.md %}
+
 Please review the following supported and accepted pull request rules. We defined these rules to simplify and accelerate your submissions, follow code consistency, manage current and backlog tasks, and so on.
 
-|     |                 Fix for Existing Issue                 |                     Test Coverage                      |                      Refactoring                       |                      New Feature                       |                      Code Cleanup                      |
-|:----|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|
-| 2.1 | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |
-| 2.2 | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) |    ![No]({{site.baseurl}}/common/images/red-x.png)     |    ![No]({{site.baseurl}}/common/images/red-x.png)     |
-| 2.3 | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) | ![Yes]({{site.baseurl}}/common/images/green-check.png) |
+{% include contributor/pull-request-table.md %}
 
 ## Contribution requirements {#requirements}
 
@@ -108,6 +107,8 @@ Check out this video to see the process in action:
 
 ## Create a pull request {#pull_request}
 
+{% include contributor/2-1-end.md %}
+
 First, check the [existing PRs](https://github.com/magento/magento2/pulls?q=is%3Aopen+is%3Apr){:target="_blank"} and make sure you are not duplicating others’ work.
 
 To create a pull request:

guides/v2.1/contributor-guide/templates/basic_template.md

@@ -12,6 +12,25 @@ The purpose of this page is to provide you with a pre-formatted template and use
 
 You can start off by editing the local version of this file using markdown language (and {% glossarytooltip a2aff425-07dd-4bd6-9671-29b7edefa871 %}HTML{% endglossarytooltip %} where needed). Then, create a Pull Request to have your contribution reviewed by the DevDocs team.
 
+## Metadata parameters
+
+Add the following metadata parameters at the top of your page. We use YAML for the metadata in front matter. We use this data when generating the DevDocs for the following:
+
+Parameter | Description
+--- | ---
+`group:` | The table of contents this file belongs to, which points to files located in `_data/toc/`. Only add the name of the file without the extension. For example, the group of this file is `group: contributor-guide`, which points to the table of contents defined in `_data/toc/contributor-guide.yml`.
+`title:` | The title of the page.
+`functional_areas:`  |  Optional. Adds facets for search results. Available facets include: Sales, Products, Carts, Customers, Marketing, Account, Content, Reports, Stores, System, Catalog, Orders, Frontend, Theme, Staging, Search, Configurations, Integration, Services, Tools, Setup, Testing, test, Standards, Install, Upgrade, B2B, Cloud, and Bundled extensions. These facets are case sensitive and support multiple facets separated by commas. For example: `functional_areas: Install`.
+`redirect_from`  | Optional. Add a list of other pages in DevDocs that should redirect to this page. The link should start with the `/guides` directory. For an example, see the source code for this template page.
+`ee_only:` | Optional. If set to `true`, graphics/cues display on the page indicating it applies to {{site.data.var.ee}}.
+{:style="table-layout:auto;"}
+
+{%
+include note.html
+type='info'
+content='If you need help with metadata, we can help in your submitted pull requests.'
+%}
+
 ## Basic Markdown Syntax {#basic}
 
 Below are some basic examples of what you can do with markdown.

guides/v2.1/contributor-guide/templates/tutorial-template-first.md

@@ -17,7 +17,7 @@ A tutorial provides procedural information spread across multiple pages. It cont
 
 ## Metadata parameters
 
-You must use the following {% glossarytooltip 3f0f2ef1-ad38-41c6-bd1e-390daaa71d76 %}metadata{% endglossarytooltip %} parameters on the tutorial index page.
+You must use the following metadata parameters on the tutorial index page.
 
 Parameter | Description
 --- | ---
@@ -27,6 +27,8 @@ Parameter | Description
 `menu_title:` | On the index page of the tutorial, specify `Initial tasks`.
 `menu_order:` | The sequence number of the topic. For the index page in a multi-step tutorial, set this 0.
 `return_to:` | Defines the tutorial's parent page. The parent page title is displayed in the left navigation above the tutorial steps. Do not specify a value for the `return_to:` parameter. Instead, specify values for these second-level parameters:<br/><br/>`title:` The title of the parent topic<br/><br/>`url:` The URL of the parent topic
+`functional_areas:`  |  Optional. Adds facets for search results. Available facets include: sales, products, carts, customers, marketing, account, content, reports, stores, system, catalog, orders, frontend, theme, staging, search, configurations, integration, services, tools, setup, testing or test, standards, install, upgrade, B2B, cloud, and bundled extensions.
+`redirect_from`  | Optional. Add a list of other pages in DevDocs that should redirect to this page. The link should start with the `/guides` directory. For an example, see the source code for this template page.  |  
 `ee_only:` | Optional. If set to `true`, graphics/cues indicating that the article applies to {{site.data.var.ee}} are displayed on devdocs.
 {:style="table-layout:auto;"}