diff --git a/DISCLAIMER.md b/DISCLAIMER.md index e951aaff90a3dbd11d796b8a20dd62ee36633519..ecb48a2711fc55656c7266640747b124650bdab5 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1,11 +1,4 @@ Disclaimer ========== -This software is preliminary or provisional and is subject to revision. It is -being provided to meet the need for timely best science. The software has not -received final approval by the U.S. Geological Survey (USGS). No warranty, -expressed or implied, is made by the USGS or the U.S. Government as to the -functionality of the software and related material nor shall the fact of release -constitute any such warranty. The software is provided on the condition that -neither the USGS nor the U.S. Government shall be held liable for any damages -resulting from the authorized or unauthorized use of the software. +This software has been approved for release by the U.S. Geological Survey (USGS). Although the software has been subjected to rigorous review, the USGS reserves the right to update the software as needed pursuant to further analysis and review. No warranty, expressed or implied, is made by the USGS or the U.S. Government as to the functionality of the software and related material nor shall the fact of release constitute any such warranty. Furthermore, the software is released on condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from its authorized or unauthorized use. diff --git a/README.md b/README.md index ee3d14473a2345a23dba327592d4281530243fde..90c6f2e1f30d21bb6564accde207361307fdc377 100644 --- a/README.md +++ b/README.md @@ -212,18 +212,11 @@ issue. If you have direct contributions you would like considered for incorporation into the project you can [fork this repository][2] and -[submit a pull request][3] for review. +[submit a merge request][3] for review. ## Disclaimer -This software is preliminary or provisional and is subject to revision. It is -being provided to meet the need for timely best science. The software has not -received final approval by the U.S. Geological Survey (USGS). No warranty, -expressed or implied, is made by the USGS or the U.S. Government as to the -functionality of the software and related material nor shall the fact of release -constitute any such warranty. The software is provided on the condition that -neither the USGS nor the U.S. Government shall be held liable for any damages -resulting from the authorized or unauthorized use of the software. +This software has been approved for release by the U.S. Geological Survey (USGS). Although the software has been subjected to rigorous review, the USGS reserves the right to update the software as needed pursuant to further analysis and review. No warranty, expressed or implied, is made by the USGS or the U.S. Government as to the functionality of the software and related material nor shall the fact of release constitute any such warranty. Furthermore, the software is released on condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from its authorized or unauthorized use. ## Code of Conduct @@ -231,8 +224,8 @@ All contributions to- and interactions surrounding- this project will abide by the [USGS Code of Scientific Conduct][4]. [1]: https://code.usgs.gov/vtcfwru/shinymgr/issues -[2]: https://docs.gitlab.com/ee/workflow/forking_workflow.html#creating-a-fork -[3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html +[2]: https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#project-forking-workflow +[3]: https://code.usgs.gov/vtcfwru/shinymgr/-/merge_requests [4]: https://www.usgs.gov/about/organization/science-support/science-quality-and-integrity/code-scientific-conduct