diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 37e79e31..8a1dfa1d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,8 +60,8 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to -[Michael Schlottke-Lakemper](mailto:m.schlottke-lakemper@acom.rwth-aachen.de), -[Hendrik Ranocha](mailto:mail@ranocha.de), +[Boris Kaus](https://www.geosciences.uni-mainz.de/geophysics-and-geodynamics/team/univ-prof-dr-boris-kaus/), +[Marcel Thielmann](https://www.staff.uni-bayreuth.de/~bt303651/), or any other of the principal developers responsible for enforcement listed in [AUTHORS.md](AUTHORS.md). All complaints will be reviewed and investigated promptly and fairly. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..89bc148a --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Boris Kaus, Marcel Thielmann and Authors (see AUTHORS.md) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE 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. diff --git a/docs/make.jl b/docs/make.jl index bbc8073c..dca5a8b3 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -7,13 +7,13 @@ using Documenter # Get GeophysicalModelGenerator.jl root directory GMG_root_dir = dirname(@__DIR__) -include(joinpath(GMG_root_dir, "docs", "man", "make.jl")) - # Copy list of authors to not need to synchronize it manually authors_text = read(joinpath(GMG_root_dir, "AUTHORS.md"), String) authors_text = replace(authors_text, "in the [LICENSE.md](LICENSE.md) file" => "under [License](@ref)") write(joinpath(@__DIR__, "src", "man", "authors.md"), authors_text) - +#Contributing +contributing = read(joinpath(GMG_root_dir, "CONTRIBUTING.md"), String) +write(joinpath(@__DIR__, "src", "man", "contributing.md"), contributing) # Copy some files from the repository root directory to the docs and modify them # as necessary @@ -76,8 +76,7 @@ makedocs(; "List of functions" => "man/listfunctions.md", "Authors" => "man/authors.md", "Contributing" => "man/contributing.md", - "Code of Conduct" => "code_of_conduct.md", - "License" => "license.md", + "Code of Conduct" => "man/code_of_conduct.md" ], )