Merge branch 'develop'

natcap · Sep 25, 2023 · 86d477b · 86d477b
2 parents 5456e1d + 27e5015
commit 86d477b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ activity_mask_rasters/
 impact_potential_rasters/
 spatial_weighting_maps/
 test_workspace/
-*.ipynb
+*.ipynb
+archive/
diff --git a/docsrc/index.rst b/docsrc/index.rst
@@ -3,7 +3,7 @@ Welcome to the documentation for ROOT
 
 ROOT is tool designed to facilitate multi-objective landscape planning. It uses an optimization approach to help identify opportunities to maximize cobenefits and to identify compromise solutions where required.
 
-This page provides guidance on using ROOT. Links to the most recent version of ROOT can be found on the :ref:`intro page<Getting ROOT and sample data>`. The Narrative Example section provides an introductory walkthrough of a ROOT application. The Workflow and Interface guide sections provide descriptions of the various steps in using ROOT, how to prepare data, structure the analysis, and interact with the tool and its outputs. Finally, the Sample data walkthrough gives a worked example similar to the Narrative Example but with more details spelled out and with accompanying sample data.
+This page provides guidance on using ROOT. Links to the most recent version of ROOT can be found on the :ref:`intro page<Getting ROOT and sample data>`. The Narrative Example section provides an introductory walkthrough of a ROOT application. The Workflow and Interface guide sections provide descriptions of the various steps in using ROOT, how to prepare data, structure the analysis, and interact with the tool and its outputs. Finally, the Sample Data walkthrough gives a worked example similar to the Narrative Example but with more details spelled out and with accompanying sample data.
 
 
 .. toctree::