From 0888d727b1cfed3232f55a1b22ffb85be6be838a Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Sat, 12 Jun 2021 11:53:42 -0600 Subject: [PATCH] project root docs update --- CODE_OF_CONDUCT.md | 7 +++++++ CONTRIBUTING.md | 16 ++++++++++++++++ DISCLAIMER.md | 22 +++++++++++----------- LICENSE.md | 46 ++++++++++++++++++++++++++++++---------------- README.md | 10 +++++----- 5 files changed, 69 insertions(+), 32 deletions(-) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..0052da372 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,7 @@ +Code of Conduct +=============== + +All contributions to and interactions surrounding this project will abide by +the [USGS Code of Scientific Conduct][1]. + +[1]: https://www2.usgs.gov/fsp/fsp_code_of_scientific_conduct.asp diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..4f36ec9e2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,16 @@ +Contributing +============ + +Contributions are welcome from the community. Questions can be asked on the +[issues page][1]. Before creating a new issue, please take a moment to search +and make sure a similar issue does not already exist. If one does exist, you +can comment (most simply even with just a `:+1:`) to show your support for that +issue. + +If you have direct contributions you would like considered for incorporation +into the project you can [fork this repository][2] and +[submit a merge request][3] for review. + +[1]: https://code.usgs.gov/ghsc/nshmp/nshm-fault-sections/issues +[2]: https://docs.gitlab.com/ee/gitlab-basics/fork-project.html +[3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html diff --git a/DISCLAIMER.md b/DISCLAIMER.md index d9d9d57bf..d7e2fe9e3 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1,12 +1,12 @@ -# Disclaimer +Disclaimer +========== -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Information provided by this software may be preliminary or provisional and is subject to -revision. It is being provided to meet the need for timely best science. The information is -provided on the condition that neither the U.S. Geological Survey nor the U.S. Government -shall be held liable for any damages resulting from the authorized or unauthorized use of the information. +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/LICENSE.md b/LICENSE.md index c0356e39a..87c1db9b0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,22 +1,36 @@ -# License +Unless otherwise noted, this project is in the public domain in the United +States because it contains materials that originally came from the United +States Geological Survey, an agency of the United States Department of +Interior. For more information, see the official USGS copyright policy at +https://www2.usgs.gov/visual-id/credit_usgs.html#copyright -Unless otherwise noted, this software is in the public domain because it contains materials -that originally came from the U.S. Geological Survey (USGS), an agency of the U.S. Department -of Interior. For more information, see the official USGS -[copyright policy](http://www.usgs.gov/visual-id/credit_usgs.html#copyright). +Additionally, we waive copyright and related rights in the work +worldwide through the CC0 1.0 Universal public domain dedication. -Dependent libraries managed by the [Gradle](https://gradle.org) build tool are distributed - under open source (or open source-like) licenses. Links to appropriate license agreements - for each can be found below. +## CC0 1.0 Universal Summary -## Runtime language and libraries +This is a human-readable summary of the +[Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode). -- [Java 8](http://www.oracle.com/technetwork/java/javase/terms/license) -- [Google Guava 26.0](https://github.com/google/guava/blob/master/COPYING) -- [Google Gson 2.8.5](https://github.com/google/gson/blob/master/LICENSE) +### No Copyright -## Build tools and libraries +The person who associated a work with this deed has dedicated the work to +the public domain by waiving all of his or her rights to the work worldwide +under copyright law, including all related and neighboring rights, to the +extent allowed by law. + +You can copy, modify, distribute and perform the work, even for commercial +purposes, all without asking permission. + +### Other Information + +In no way are the patent or trademark rights of any person affected by CC0, +nor are the rights that other persons may have in the work or in how the +work is used, such as publicity or privacy rights. + +Unless expressly stated otherwise, the person who associated a work with +this deed makes no warranties about the work, and disclaims liability for +all uses of the work, to the fullest extent permitted by applicable law. +When using or citing the work, you should not imply endorsement by the +author or the affirmer. -- [Gradle](https://github.com/gradle/gradle/blob/master/LICENSE) -- [JUnit](http://junit.org/junit4/license.html) -- [JaCoCo](http://www.jacoco.org/jacoco/trunk/doc/license.html) diff --git a/README.md b/README.md index a1abe1fcb..2bb73ffc7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# nshmp-haz +nshmp-haz +========= -U.S. Geological Survey ([USGS](https://www.usgs.gov)) National Seismic Hazard Mapping Project -([NSHMP](https://earthquake.usgs.gov/hazards/)) code for performing probabilistic seismic hazard +U.S. Geological Survey ([USGS](https://www.usgs.gov)) National Seismic Hazard Model Project +([NSHMP](https://earthquake.usgs.gov/hazards/)) codes for performing probabilistic seismic hazard (PSHA) and related analyses. These codes are intended for use with seismic hazard models developed by the NSHMP for the U.S. and its territories. -Please see the [wiki](https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/wikis/home) -for more information. +Please see the [docs](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/docs) for more information. -- GitLab