Fix: merge conflict

Author: lwasser

.github/ISSUE_TEMPLATE/help-request.md

@@ -57,8 +57,8 @@ Repository Link (if existing):
 **P.S.** *Have feedback/comments about our review process? Leave a comment [here][Comments]
 
 
-[PackagingGuide]: https://www.pyopensci.org/contributing-guide/authoring/index.html#packaging-guide
+[PackagingGuide]: https://www.pyopensci.org/python-package-guide/
 
-[PackageCategories]: https://www.pyopensci.org/contributing-guide/open-source-software-peer-review/aims-and-scope.html?highlight=data#package-categories
+[PackageCategories]: https://www.pyopensci.org/software-peer-review/about/package-scope.html
 
-[Comments]: https://github.com/pyOpenSci/governance/issues/8
+[Comments]: https://pyopensci.discourse.group/

.github/ISSUE_TEMPLATE/presubmission-inquiry.md

@@ -23,7 +23,8 @@ We partner with communities to support peer review with an additional layer of
 checks that satisfy community requirements. If your package fits into an 
 existing community please check below:
 
-- [ ] Pangeo
+- [ ] [Pangeo][pangeoWebsite]
+	- [ ] My package adheres to the [Pangeo standards listed in the pyOpenSci peer review guidebook][PangeoCollaboration]
 
 ## Scope 
 
@@ -51,6 +52,10 @@ existing community please check below:
 **P.S.** *Have feedback/comments about our review process? Leave a comment [here][Comments]
 
 
-[PackageCategories]: https://www.pyopensci.org/contributing-guide/open-source-software-peer-review/aims-and-scope.html?highlight=data#package-categories
+[PackageCategories]: https://www.pyopensci.org/software-peer-review/about/package-scope.html
 
-[Comments]: https://github.com/pyOpenSci/governance/issues/8
+[Comments]: https://pyopensci.discourse.group/
+
+[PangeoCollaboration]: https://www.pyopensci.org/scientific-communities/pangeo-collaboration
+
+[pangeoWebsite]: https://www.pangeo.io

.github/ISSUE_TEMPLATE/submit-software-for-review.md

@@ -26,26 +26,36 @@ Date accepted (month/day/year): TBD
 
 - Include a brief paragraph describing what your package does:
 
-## Community Partnerships
-We partner with communities to support peer review with an additional layer of 
-checks that satisfy community requirements. If your package fits into an 
-existing community please check below:
-
-- [ ] [Pangeo][pangeoWebsite]
-	- [ ] My package adheres to the [Pangeo standards listed in the pyOpenSci peer review guidebook][PangeoCollaboration]
 
 ## Scope 
-- Please indicate which [category or categories][PackageCategories] this package falls under:
+- Please indicate which [category or categories][PackageCategories] this package falls under (If you are unsure of which category you fit, we suggest you make a pre-submission inquiry):
+
 	- [ ] Data retrieval
 	- [ ] Data extraction
-	- [ ] Data munging
+	- [ ] Data processing/munging
 	- [ ] Data deposition
-	- [ ] Reproducibility
+	- [ ] Data validation and testing
+	- [ ] Data visualization **
+	- [ ] Workflow automation
+	- [ ] Citation management and bibliometrics
+	- [ ] Scientific software wrappers
+	- [ ] Database interoperability
+
+Domain Specific & Community Partnerships 
+
 	- [ ] Geospatial
 	- [ ] Education
-	- [ ] Data visualization*
+	- [ ] Pangeo
+	
+
+## Community Partnerships
+If your package is associated with an 
+existing community please check below:
+- [ ] [Pangeo][pangeoWebsite]
+	- [ ] My package adheres to the [Pangeo standards listed in the pyOpenSci peer review guidebook][PangeoCollaboration]
 
-> *Please fill out a pre-submission inquiry before submitting a data visualization package. For more info, see [notes on categories][NotesOnCategories] of our guidebook.*
+
+> ** Please fill out a pre-submission inquiry before submitting a data visualization package.*
 
 
 - **For all submissions**, explain how the and why the package falls under the categories you indicated above. In your explanation, please address the following points (briefly, 1-2 sentences for each):  
@@ -68,7 +78,7 @@ For details about the pyOpenSci packaging requirements, see our [packaging guide
 - [ ] has a test suite.
 - [ ] has continuous integration, such as Travis CI, AppVeyor, CircleCI, and/or others.
 
-## Publication options
+## Publication Options
 
 - [ ] Do you wish to automatically submit to the [Journal of Open Source Software][JournalOfOpenSourceSoftware]? If so:
 
@@ -106,29 +116,24 @@ The [editor template can be found here][Editor Template].
 
 The [review template can be found here][Review Template].
 
-[PackagingGuide]: https://www.pyopensci.org/contributing-guide/authoring/index.html#packaging-guide
-
-[PackageCategories]: https://www.pyopensci.org/contributing-guide/open-source-software-peer-review/aims-and-scope.html?highlight=data#package-categories
-
-[NotesOnCategories]: https://www.pyopensci.org/contributing-guide/open-source-software-peer-review/aims-and-scope.html?highlight=data#notes-on-categories
+[PackagingGuide]: https://www.pyopensci.org/python-package-guide/
 
+[PackageCategories]: https://www.pyopensci.org/software-peer-review/about/package-scope.html
 
 [JournalOfOpenSourceSoftware]: http://joss.theoj.org/
 
 [JossSubmissionRequirements]: https://joss.readthedocs.io/en/latest/submitting.html#submission-requirements
 
 [JossPaperRequirements]: https://joss.readthedocs.io/en/latest/submitting.html#what-should-my-paper-contain
 
-[PyOpenSciCodeOfConduct]: https://www.pyopensci.org/contributing-guide/open-source-software-peer-review/code-of-conduct.html?highlight=code%20conduct
+[PyOpenSciCodeOfConduct]: https://www.pyopensci.org/governance/CODE_OF_CONDUCT
 
 [OsiApprovedLicense]: https://opensource.org/licenses
 
-[Editor Template]: https://www.pyopensci.org/peer-review-guide/software-peer-review-guide/editors-guide.html#respond-to-the-submitter-in-the-github-issue
-
-[Review Template]: https://www.pyopensci.org/peer-review-guide/software-peer-review-guide/reviewer-guide.html#peer-review-template
+[Templates]: https://www.pyopensci.org/software-peer-review/appendices/templates.html
 
-[Comments]: https://github.com/pyOpenSci/governance/issues/8
+[Comments]: https://pyopensci.discourse.group/
 
-[PangeoCollaboration]: https://www.pyopensci.org/scientific-communities/pangeo-collaboration
+[PangeoCollaboration]: https://www.pyopensci.org/software-peer-review/partners/pangeo
 
 [pangeoWebsite]: https://www.pangeo.io