diff --git a/README.md b/README.md index 4ad258fac9c10afd5e622371f84281ba8470bbaa..e7e2e2792c84efa8f49ad7ca39309075b38ac148 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,13 @@ * [Requests for Comment](README.md#Requests-for-Comment) * [FAQ](README.md#FAQ) * [Installation](README.md#Installation) +* [ISIS Tutorials](README.md#ISIS-Tutorials) * [Citing ISIS](README.md#Citing-ISIS) * [Start Contributing](https://github.com/USGS-Astrogeology/ISIS3/wiki/How-to-Start-Contributing) * [ISIS Data Area](README.md#The-ISIS-Data-Area) * [Installing Older Versions of ISIS](README.md#Installing-older-versions-of-ISIS) + ## Requests for Comment The ISIS project uses a Request for Comment (RFC) model whereby major potential changes to the code base, data area, or binary delivery process are proposed, iterated on by any interested parties, and potentially adopted. Right now, RFCs are being housed in this repository's [wiki](https://github.com/USGS-Astrogeology/ISIS3/wiki) with associated discussions occurring on [astrodiscuss](https://astrodiscuss.usgs.gov). @@ -117,7 +119,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ ### Installation with Docker The ISIS production Dockerfile automates the conda installation process above. You can either build the Dockerfile yourself or use the -[usgsastro/isis](https://hub.docker.com/repository/docker/usgsastro/isis) +[usgsastro/isis](https://hub.docker.com/repository/docker/usgsastro/isis) image from DockerHub. #### To build the Dockerfile @@ -325,6 +327,9 @@ To build and compile ISIS requires following the instructions listed below, whic - [Building ISIS documentation](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-isis3-documentation) - [What to do if you encounter any problems](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#problems) +## ISIS Tutorials +Please refer to the GitHub wiki page [ISIS Online Workshops](https://github.com/USGS-Astrogeology/ISIS3/wiki/ISIS_Online_Workshops) for current ISIS tutorials. + ## Citing ISIS This project uses a [Zenodo](https://zenodo.org) generated DOI. The badge at the top of this README links to the DOI for the [latest release](https://doi.org/10.5281/zenodo.2563341). It is [good practice](https://help.zenodo.org) (See 'Which DOI Should I Use in Citations?') to cite the version of the software being used by the citing work. To obtain this DOI, one can follow the [link to the latest version](https://doi.org/10.5281/zenodo.2563341) and then check the right sidebar area titled **Versions** for a listing of all ISIS versions that currently have a Zenodo DOI. diff --git a/isis/src/docsys/build/UserDocs.xsl b/isis/src/docsys/build/UserDocs.xsl index 30802b16affa74ecbf44bf73abae040fd8934b26..89c4e88ac6e18bf3d24fc5c46b22bdbd2a2f3544 100644 --- a/isis/src/docsys/build/UserDocs.xsl +++ b/isis/src/docsys/build/UserDocs.xsl @@ -125,7 +125,7 @@ Deborah Lee Soltesz </tr> <tr valign="top"> <th style="width:25%"> - <a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/ISIS_Online_Workshops" target="_blank" title="Launch ISIS Workshop in a new window"> + <a href="https://github.com/USGS-Astrogeology/ISIS3/wiki/ISIS_Online_Workshops" target="_blank" title="Launch ISIS Workshop in a new window"> ISIS Workshop</a> </th> <td> diff --git a/isis/src/docsys/build/menu.xsl b/isis/src/docsys/build/menu.xsl index ebb68d6ec168872548bb35d6b05b59c602ff8712..3e2239622a9865639b1ae67063cf068f4ad6f950 100644 --- a/isis/src/docsys/build/menu.xsl +++ b/isis/src/docsys/build/menu.xsl @@ -50,7 +50,7 @@ Deborah Lee Soltesz <!-- Isis Workshop is only available on the website --> <div> - <a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/ISIS_Online_Workshops" target="_blank" title="Launch ISIS Workshop in a new window"> + <a href="https://github.com/USGS-Astrogeology/ISIS3/wiki/ISIS_Online_Workshops" target="_blank" title="Launch ISIS Workshop in a new window"> Tutorials</a> </div> diff --git a/isis/src/docsys/documents/Isis2Tutorials/Isis2Tutorials.xml b/isis/src/docsys/documents/Isis2Tutorials/Isis2Tutorials.xml index d0726e95c83db8e8af77ce4502320027c81f8978..59f2489c4afcb687b210c995b4f661b0fef524f3 100644 --- a/isis/src/docsys/documents/Isis2Tutorials/Isis2Tutorials.xml +++ b/isis/src/docsys/documents/Isis2Tutorials/Isis2Tutorials.xml @@ -42,12 +42,19 @@ <body> <h2>General</h2> + <p> + <b>NOTE</b> This page and the below tutorials are no longer maintained. + These resources remain available for historical purposes and because some + of this information may be useful to the community. However, we do + not guarantee that they are consistent with the current ISIS release. + Please see <a href="https://github.com/USGS-Astrogeology/ISIS3/wiki/ISIS_Online_Workshops"> + ISIS Online Workshops</a> for current ISIS tutorials. + </p> <ul> <LI><A HREF="http://isis.astrogeology.usgs.gov/Isis2/isis-bin/idl_prog_notes.cgi">Accessing an ISIS Cube from an IDL Program</A></LI> <LI><A HREF="http://isis.astrogeology.usgs.gov/Isis2/isis-bin/exchange_data.cgi">Exchanging Data with Other Software Systems</A></LI> </ul> - <h2>Digital Image Processing Procedures</h2> <UL> <LI><A HREF="http://isis.astrogeology.usgs.gov/Isis2/isis-bin/intro_digi_mosaic.cgi">Production of Digital Image Models with ISIS</A></LI> @@ -73,6 +80,7 @@ <history> <change name="Deborah Lee Soltesz" date="2003-04-03">Created</change> + <change name="Amy Stamile" date="2021-04-15">Updated document</change> </history> </documentation>