From 38601b5ed49408176af2b3f13c511bc6a1afd20c Mon Sep 17 00:00:00 2001 From: Jo Kroese Date: Mon, 4 Sep 2023 13:59:23 +0100 Subject: [PATCH] clarify licensing --- DESCRIPTION | 2 +- LICENSE | 23 +++++++++++++++++++++-- LICENSE.md | 21 --------------------- README.Rmd | 4 +++- README.md | 10 +++++++--- 5 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 LICENSE.md diff --git a/DESCRIPTION b/DESCRIPTION index 19e3e0e..b09ec26 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,8 +4,8 @@ Version: 0.0.0.9000 Authors@R: person("Jo", "Kroese", , "jo@jokroese.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-6995-6797")) Description: What the package does (one paragraph). -License: MIT + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 URL: https://dataknit.github.io/ukcensus/ +License: MIT diff --git a/LICENSE b/LICENSE index 6612755..fdb6fec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,21 @@ -YEAR: 2023 -COPYRIGHT HOLDER: ukcensus authors +MIT License + +Copyright (c) 2023 Dataknit + +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/LICENSE.md b/LICENSE.md deleted file mode 100644 index 7e7343b..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -# MIT License - -Copyright (c) 2023 ukcensus authors - -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/README.Rmd b/README.Rmd index 297729d..7f37b98 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,7 +18,7 @@ knitr::opts_chunk$set( -ukcensus is an R package designed to simplify the retrieval and analysis of Census 2021 data from England and Wales. It allows you to create custom datasets of the census, outputting them to tibble format. +ukcensus is an R package designed to simplify the retrieval of Census 2021 data from England and Wales. It allows you to create custom datasets of the census, outputting them to tibble format. ## Installation @@ -68,6 +68,8 @@ We welcome contributions to the ukcensus package. If you have suggestions, bug r The ukcensus package is open-source and distributed under the MIT License. See the LICENSE file for more details. +The data accessed through the ukcensus package is sourced from the Office for National Statistics (ONS) of England and Wales. This data is made available through the Open Government License (OGL). + ## Acknowledgments The ukcensus package is made possible through England and Wales' Office for National Statistics (ONS) work on designing and collecting the census and making it available through an [open API](https://developer.ons.gov.uk/). This package uses the [Create a Custom Dataset](https://developer.ons.gov.uk/createyourowndataset/) functionality. diff --git a/README.md b/README.md index 6e20e44..e638799 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ -ukcensus is an R package designed to simplify the retrieval and analysis -of Census 2021 data from England and Wales. It allows you to create -custom datasets of the census, outputting them to tibble format. +ukcensus is an R package designed to simplify the retrieval of Census +2021 data from England and Wales. It allows you to create custom +datasets of the census, outputting them to tibble format. ## Installation @@ -94,6 +94,10 @@ issue or submit a pull request on the GitHub repository. The ukcensus package is open-source and distributed under the MIT License. See the LICENSE file for more details. +The data accessed through the ukcensus package is sourced from the +Office for National Statistics (ONS) of England and Wales. This data is +made available through the Open Government License (OGL). + ## Acknowledgments The ukcensus package is made possible through England and Wales’ Office