diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..fcb1a06ad --- /dev/null +++ b/NOTICE @@ -0,0 +1,20 @@ +Charliecloud is copyright © Triad National Security, LLC and others. + +This software was produced in part under U.S. Government contract +89233218CNA000001 for Los Alamos National Laboratory (LANL), which is operated +by Triad National Security, LLC for the U.S. Department of Energy/National +Nuclear Security Administration. + +The Government is granted for itself and others acting on its behalf a +nonexclusive, paid-up, irrevocable worldwide license in this material to +reproduce, prepare derivative works, distribute copies to the public, perform +publicly and display publicly, and to permit others to do so. + +Neither the government nor Triad National Security, LLC makes any warranty, +express or implied, or assumes any liability for use of this software. + +If software is modified to produce derivative works, such derivative works +should be clearly marked, so as not to confuse it with the version available +from LANL. + +LA-CC 14-096 diff --git a/README.rst b/README.rst index 0e6d8c311..33bd01e3a 100644 --- a/README.rst +++ b/README.rst @@ -135,32 +135,15 @@ Other publications: Supercomputing*. DOI: `10.1145/3624062.3624585 `_. -Copyright and license ---------------------- - -Charliecloud is copyright © 2014–2023 Triad National Security, LLC and others. - -This software was produced under U.S. Government contract 89233218CNA000001 -for Los Alamos National Laboratory (LANL), which is operated by Triad National -Security, LLC for the U.S. Department of Energy/National Nuclear Security -Administration. - -This is open source software (LA-CC 14-096); you can redistribute it and/or -modify it under the terms of the Apache License, Version 2.0. A copy is -included in file LICENSE. You may not use this software except in compliance -with the license. - -The Government is granted for itself and others acting on its behalf a -nonexclusive, paid-up, irrevocable worldwide license in this material to -reproduce, prepare derivative works, distribute copies to the public, perform -publicly and display publicly, and to permit others to do so. +License and intellectual property +--------------------------------- -Neither the government nor Triad National Security, LLC makes any warranty, -express or implied, or assumes any liability for use of this software. +Charliecloud is open source software; you can redistribute it and/or modify it +under the terms of the Apache License, Version 2.0. A copy is included in file +LICENSE. You may not use this software except in compliance with the license. -If software is modified to produce derivative works, such derivative works -should be clearly marked, so as not to confuse it with the version available -from LANL. +Copyrights and patents are retained by contributors. No copyright assignment +is required to contribute to Charliecloud. .. LocalWords: USENIX's CNA Meisam figshare diff --git a/doc/conf.py b/doc/conf.py index 59588572b..7a40c46b3 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -65,7 +65,7 @@ # General information about the project. project = u'Charliecloud' -copyright = u'2014–2023, Triad National Security, LLC and others' +copyright = u'Charliecloud a Series of LF Projects, LLC and others (web content and website). For web site terms of use, trademark policy and other project policies please see: https://lfprojects.org' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/misc/loc b/misc/loc index eed3ce947..1780eb364 100755 --- a/misc/loc +++ b/misc/loc @@ -127,6 +127,7 @@ patch plain text filter remove_matches TEXT_HAS_NO_COMMENTS_BUT_A_FILTER_IS_REQUIRED extension txt + filename NOTICE filename PERUSEME filename README filename VERSION @@ -257,6 +258,7 @@ countem "TEST SUITE & EXAMPLES" /tmp/loc.test # documentation find . -type f -a \( \ -path './doc/*.rst' \ + -o -path ./NOTICE \ -o -path ./README.rst \ -o -path ./doc/conf.py \ -o -path ./doc/make-deps-overview \