Merge conflict

docs/how-to-guides/Image Processing/Map Projecting Images.md → docs/how-to-guides/image-processing/map-projecting-images.md

@@ -27,11 +27,11 @@ The main application to project an image is
     that is supported within ISIS
   @TODO
   - Proper ingestion of the image data into ISIS ( [**Importing Mission
-    Data**](Map%20Projecting%20Images.md) )
+    Data**](map-projecting-images.md) )
   @TODO
-  - Available [**SPICE**](Map%20Projecting%20Images.md) information for every
+  - Available [**SPICE**](map-projecting-images.md) information for every
     individual image
-  - A [**map template**](../../concepts/Camera%20Geometry%20and%20Projections/Learning%20About%20Map%20Projections.md) to define an
+  - A [**map template**](../../concepts/camera-geometry-and-projections/learning-about-map-projections.md) to define an
     output map projection
 
 
@@ -39,10 +39,10 @@ The main application to project an image is
 
 -----
 
-[**ISIS Supported Projections**](../../concepts/Camera%20Geometry%20and%20Projections/Learning%20About%20Map%20Projections.md)
+[**ISIS Supported Projections**](../../concepts/camera-geometry-and-projections/learning-about-map-projections.md)
 
   - For detailed information about Map Projections within ISIS refer to
-    [Learning About Map Projections](../../concepts/Camera%20Geometry%20and%20Projections/Learning%20About%20Map%20Projections.md) .
+    [Learning About Map Projections](../../concepts/camera-geometry-and-projections/learning-about-map-projections.md) .
 
 
 ## Defining an Output Map 
@@ -63,8 +63,8 @@ parameter to a supported map projection.
   - In conjunction with the supplied map templates; the default for an
     output map are as follows:
     
-      - The original [**raw camera geometry**](../../concepts/Camera%20Geometry%20and%20Projections/Camera%20Geometry.md)
-      - [**Computed parameters**](../../concepts/Camera%20Geometry%20and%20Projections/Learning%20About%20Map%20Projections.md)
+      - The original [**raw camera geometry**](../../concepts/camera-geometry-and-projections/camera-geometry.md)
+      - [**Computed parameters**](../../concepts/camera-geometry-and-projections/learning-about-map-projections.md)
       - The target body is defined in the system defaults which can be
         found in $ISISDATA/base/templates/targets/.
 
@@ -74,7 +74,7 @@ parameter to a supported map projection.
   - The viewing geometry of an image(s) are important details to
     consider when defining an output map projection.
       - There are a number of applications that report relevant
-        [**camera geometry**](../../concepts/Camera%20Geometry%20and%20Projections/Camera%20Geometry.md) information for a given
+        [**camera geometry**](../../concepts/camera-geometry-and-projections/camera-geometry.md) information for a given
         image or a list of images.
       - Does your input cover the north or south pole of the body?
       - Do you want your output map to be centered at a specific
@@ -82,7 +82,7 @@ parameter to a supported map projection.
       - Do you plan on mosaicking your images together?
       - An output mosaic (digital image map-DIM) is a major
         consideration before projecting multiple images. Refer to
-        [**Making Mosaics**](../../concepts/Camera%20Geometry%20and%20Projections/Learning%20About%20Map%20Projections.md).
+        [**Making Mosaics**](../../concepts/camera-geometry-and-projections/learning-about-map-projections.md).
 
 
 #### The Custom Map Template 

docs/how-to-guides/ISIS Developer Guides/Writing ISIS Tests with CTest and GTest.md → docs/how-to-guides/isis-developer-guides/writing-isis-tests-with-ctest-and-gtest.md

@@ -262,4 +262,4 @@ This will ensure that the tests start with `BundleSettings`.
 
 
 !!! Tip 
-    See [the ISIS App Testing Notebook](App Testing Cookbook.md) for examples you can copy from. 
+    See [the ISIS App Testing Notebook](app-testing-cookbook.md) for examples you can copy from. 

docs/how-to-guides/software-management/guidelines-for-pull-requests.md

+# Guidelines for Pull Requests
+
+This page provides guidelines for creating a successful pull request.  These guidelines are intended to promote a style of pull request that benefits both the creator of the pull request and the reviewer.
+
+## Before Writing Code
+
+- Pull from upstream/main to ensure that your code is up to date
+- Ensure that your pull request is directly related to an issue in the repository.  If a related issue does not exist, then [create one](./guidelines-for-reporting-issues.md)
+- Gauge the complexity of the issue before beginning work.  While there is no "magic number" with respect to the number of lines a PR should contain, if it requires more than 250 changed lines of code, then it may be necessary to decompose the issue into a series of smaller issues.
+
+
+## While Addressing the Issue
+
+- Ensure that your commit messages are meaningful
+    - Instead of "Fixed bug" or "Addressed PR Feedback," the message should contain information that describes the change.
+- Follow the established coding style if one exists for the repository
+- Ensure that your changes are accompanied by an entry in the changelog
+- Write tests to cover any functionality that is added or changed
+
+
+## When Creating the Pull Request
+
+After writing code or making relevant changes, create a pull request on the appropriate repository.
+
+- Completely fill out the pull request template
+- Reference the issue with a "fixes," "closes," "resolves," etc. keyword, e.g. "Fixes #489"
+- Create comments to clarify any code changes or design decisions that may not be clear to the reviewer
+
+## Quick PR Guidelines
+
+Use the following checklist to ensure that your PR follows best practices that will allow for a quick and easy review
+
+- [ ] The PR is responsible for a single change that is summarized in the changelog.
+- [ ] The PR should not change more than 250 lines of code.  While this is not always possible, minimizing the size of the PR will ensure that a timely review can take place.
+- [ ] The PR must be tested locally before being marked ready for review
\ No newline at end of file

mkdocs.yml

@@ -39,45 +39,49 @@ nav:
   - Getting Started: 
     - Home: getting-started/index.md
     - CSM Stack:
-      - Generating an ISD, creating a CSM model, and converting coordinates: getting-started/CSM Stack/ImageToGroundTutorial.ipynb
+      - Generating an ISD, creating a CSM model, and converting coordinates: getting-started/csm-stack/image-to-ground-tutorial.ipynb
     - "Using ISIS: First Steps":
-      - Locating and Ingesting Image Data: "getting-started/Using ISIS: First Steps/Locating and Ingesting Image Data.md"
-      - Adding SPICE: "getting-started/Using ISIS: First Steps/Adding Spice.md"
-      - Exporting ISIS Data: "getting-started/Using ISIS: First Steps/Exporting ISIS Data.md"
+      - Locating and Ingesting Image Data: getting-started/using-isis-first-steps/locating-and-ingesting-image-data.md
+      - Adding SPICE:                      getting-started/using-isis-first-steps/adding-spice.md
+      - Exporting ISIS Data:               getting-started/using-isis-first-steps/exporting-isis-data.md
   - How-To Guides: 
     - Home: how-to-guides/index.md
     - Environment Setup and Maintenance:
-      - Installing ISIS Via Anaconda: how-to-guides/Environment Setup and Maintenance/Installing ISIS Via Anaconda.md
-      - Anaconda in a Network Environment: how-to-guides/Environment Setup and Maintenance/Anaconda in a Network Environment.md
-      - SPICE Kernel Updates in ISIS: how-to-guides/Environment Setup and Maintenance/SPICE Kernel Updates in ISIS.md
-    - SPICE: 
-      - Creating Spice Config Files in SpiceQL: how-to-guides/SPICE/Creating Spice Config Files in SpiceQL.md
+      - Installing ISIS Via Anaconda:      how-to-guides/environment-setup-and-maintenance/installing-isis-via-anaconda.md
+      - Anaconda in a Network Environment: how-to-guides/environment-setup-and-maintenance/anaconda-in-a-network-environment.md
+      - SPICE Kernel Updates in ISIS:      how-to-guides/environment-setup-and-maintenance/spice-kernel-updates-in-isis.md
     - Image Processing:
-      - Map Projecting Images: how-to-guides/Image Processing/Map Projecting Images.md
-      - Removing Striping Noise: how-to-guides/Image Processing/Removing Striping Noise.md
-      - General Utility with FX: how-to-guides/Image Processing/General Utility with FX.md
+      - Map Projecting Images:             how-to-guides/image-processing/map-projecting-images.md
+      - Removing Striping Noise:           how-to-guides/image-processing/removing-striping-noise.md
+      - General Utility with FX:           how-to-guides/image-processing/general-utility-with-fx.md
     - Software Management: 
-      - ISIS Public Release Process: how-to-guides/Software Management/Public Release Process.md
-      - Software Support: how-to-guides/Software Management/Software Support.md
-      - Guidelines for Reporting Issues: how-to-guides/Software Management/Guidelines for Reporting Issues.md
+      - ISIS Public Release Process:       how-to-guides/software-management/public-release-process.md
+      - Software Support:                  how-to-guides/software-management/software-support.md
+      - Guidelines for Reporting Issues:   how-to-guides/software-management/guidelines-for-reporting-issues.md
+      - Guidelines for Pull Requests: how-to-guides/software-management/guidelines-for-pull-requests.md
     - ISIS Developer Guides:
-      - How To Write ISIS Tests with CTest and GTest: how-to-guides/ISIS Developer Guides/Writing ISIS Tests with CTest and GTest.md
-      - App Testing CookBook: how-to-guides/ISIS Developer Guides/App Testing Cookbook.md
-      - Class Requirements For Using Doxygen Tags: how-to-guides/ISIS Developer Guides/Class Requirements For Using Doxygen Tags.md
-      - Developing ISIS3 with cmake: how-to-guides/ISIS Developer Guides/Developing ISIS3 with cmake.md
+      - How To Write ISIS Tests with CTest and GTest: how-to-guides/isis-developer-guides/writing-isis-tests-with-ctest-and-gtest.md
+      - App Testing CookBook:                         how-to-guides/isis-developer-guides/app-testing-cookbook.md
+      - Class Requirements For Using Doxygen Tags:    how-to-guides/isis-developer-guides/class-requirements-for-using-doxygen-tags.md
+      - Developing ISIS3 with cmake:                  how-to-guides/isis-developer-guides/developing-isis3-with-cmake.md
   - Concepts: 
     - Home:     concepts/index.md
     - Glossary: concepts/glossary/glossary.md
     - Camera Geometry and Projections:
-      - Camera Geometry: concepts/Camera Geometry and Projections/Camera Geometry.md
-      - Learning About Map Projections: concepts/Camera Geometry and Projections/Learning About Map Projections.md
+      - Camera Geometry:                     concepts/camera-geometry-and-projections/camera-geometry.md
+      - Learning About Map Projections:      concepts/camera-geometry-and-projections/learning-about-map-projections.md
     - SPICE:
-      - SPICE Overview: concepts/SPICE/SPICE Overview.md
-      - SPICE Position Functions and Requirements: concepts/SPICE/SPICE Position Functions and Requirements.md
+      - SPICE Overview:                            concepts/spice/spice-overview.md
+      - SPICE Position Functions and Requirements: concepts/spice/spice-position-functions-and-requirements.md
     - Image Processing:
-      - The Power of Spatial Filters: concepts/Image Processing/The Power of Spatial Filters.md
-      - Overview of Noise and Artifacts: concepts/Image Processing/Overview of Noise and Artifacts.md
-      - Overview of Radiometric Calibration: concepts/Image Processing/Overview of Radiometric Calibration.md
+      - The Power of Spatial Filters:        concepts/image-processing/the-power-of-spatial-filters.md
+      - Overview of Noise and Artifacts:     concepts/image-processing/overview-of-noise-and-artifacts.md
+      - Overview of Radiometric Calibration: concepts/image-processing/overview-of-radiometric-calibration.md
+    - Control Networks:
+      - Automatic Registration:         concepts/control-networks/automatic-registration.md
+      - Autoseed:                       concepts/control-networks/autoseed.md
+      - Image Registration:             concepts/control-networks/image-registration.md
+      - Multi-Instrument Registration:  concepts/control-networks/multi-instrument-registration.md
   - Manuals: manuals/index.md
 
 extra_css: