Enhance GitHub templates. (ampproject#3418)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,12 +28,12 @@ about: Create a report to help us improve
 
 <!-- Please complete the following information. -->
  - WordPress version:
- - Gutenberg plugin version (of applicable):
+ - Plugin version:
+ - Gutenberg plugin version (if applicable):
  - AMP plugin template mode:
  - PHP version:
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Plugin version [e.g. 22]
+ - OS:
+ - Browser: [e.g. chrome, safari]
  - Device: [e.g. iPhone6]
 
 <!-- Please add any additional information about the bug. Ideal dumping your [Site Health](https://wordpress.org/support/wordpress-version/version-5-2/#site-health-check) information here as well. -->
@@ -54,10 +54,10 @@ _Do not alter or remove anything below. The following sections will be managed b
 
 * <!-- One or more bullet points to describe how to test the implementation in QA. -->
 
-## Changelog entry
-
-* <!-- One sentence summarizing the PR, to be used in the changelog. -->
-
 ## Demo
 
 * <!-- A video or screenshots demoing the implementation. -->
+
+## Changelog entry
+
+* <!-- One sentence summarizing the PR, to be used in the changelog. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -24,10 +24,10 @@ _Do not alter or remove anything below. The following sections will be managed b
 
 * <!-- One or more bullet points to describe how to test the implementation in QA. -->
 
-## Changelog entry
-
-* <!-- One sentence summarizing the PR, to be used in the changelog. -->
-
 ## Demo
 
 * <!-- A video or screenshots demoing the implementation. -->
+
+## Changelog entry
+
+* <!-- One sentence summarizing the PR, to be used in the changelog. -->

contributing.md

@@ -20,7 +20,7 @@ Project maintainers are regularly monitoring issues and aim to fix open bugs qui
 
 ## Product and code contributions
 
-We'd love to have your help contributing code and features to the AMP Plugin! Head to the [Project Management guidelines](https://github.com/ampproject/amp-wp/contributing/project-management.md) as well as [Engineering guidelines](https://github.com/ampproject/amp-wp/contributing/engineering.md) for details on the process you can use to contribute.
+We'd love to have your help contributing code and features to the AMP Plugin! Head to the [Project Management guidelines](https://github.com/ampproject/amp-wp/blob/develop/contributing/projet-management.md) as well as [Engineering guidelines](https://github.com/ampproject/amp-wp/blob/develop/contributing/engineering.md) for details on the process you can use to contribute.
 
 ## Contributor license agreement