Skip to content

Commit

Permalink
Merge pull request #369 from poissonconsulting/main
Browse files Browse the repository at this point in the history
update vignettes
  • Loading branch information
joethorley authored May 6, 2024
2 parents e862898 + 9ff8e33 commit b9409dc
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 87 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ All contributors retain the original copyright to their stuff, but by contributi

**New code file:** At the top of the file, please ensure copyright and year is attributed to collaborator and assign the Apache 2.0 license

**Major addition to code file:** “Copyright YYYY Province of British Columbia” and Apache 2.0 remains as a header and either the second collaborator is added if there are changes throughout the code or copyright is listed for specific lines of code. So it could read:
**Major addition to code file:** “Copyright 2018-2024 Province of British Columbia” and Apache 2.0 remains as a header and either the second collaborator is added if there are changes throughout the code or copyright is listed for specific lines of code. So it could read:

Copyright 2020-2022 Province of British Columbia
Copyright 2018-2024 Province of British Columbia
Copyright 2024 Collaborator
Apache 2.0 License

Or

Copyright 2020-2022 Province of British Columbia
Copyright 2018-2024 Province of British Columbia
Copyright 2024 Collaborator Lines 200-500
Apache 2.0 License

**Minor changes:** If there are small changes to the code throughout the file then it may be easiest to keep these files as Copyright YYYY Province of British Columbia.
**Minor changes:** If there are small changes to the code throughout the file then it may be easiest to keep these files as Copyright 2018-2024 Province of British Columbia.
However, the contribution will be tracked through GitHub.
8 changes: 3 additions & 5 deletions R/licensing.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
#' licensing_md()
licensing_md <- function() {
"## Licensing
Copyright 2024 Province of British Columbia,
Environment and Climate Change Canada, and
Australian Government Department of
Climate Change, Energy, the Environment and Water
Copyright 2018-2024 Province of British Columbia\\
Copyright 2021 Environment and Climate Change Canada\\
Copyright 2023-2024 Australian Government Department of Climate Change, Energy, the Environment and Water
The documentation is released under the
[CC BY 4.0 License](https://creativecommons.org/licenses/by/4.0/)
Expand Down
1 change: 1 addition & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,4 @@ articles:
- articles/confidence-intervals
- embelishing-plots
- additional-technical-details
- faqs
13 changes: 9 additions & 4 deletions paper/paper.bib
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,16 @@ @article{thorley2018ssdtools
volume={3},
number={31},
pages={1082},
year={2018}
year={2018},
url = {https://joss.theoj.org/papers/10.21105/joss.01082}
}
@article{barry2012burrlioz,
title={Burrlioz 2.0 Manual},
author={Barry, S and Henderson, B},
journal={Commonwealth Science and Industrical Research Organisation.[cited 2017 September 14]. Availab le from: https://research. csiro. au/software/burrlioz},
year={2012}
journal={Commonwealth Science and Industrical Research Organisation},
year={2012},
url={https://research.csiro.au/software/burrlioz}
}

@article{fox_recent_2021,
Expand Down Expand Up @@ -180,6 +182,7 @@ @techreport{Warne2018
title = {{Revised Method for Deriving Australian and New Zealand Water Quality Guideline Values for Toxicants} – update of 2015 version.},
year = {2018},
publisher = {{Prepared for the Revision of the Australian and New Zealand Guidelines for Fresh and Marine Water Quality. Australian and New Zealand Governments and Australian state and territory governments, Canberra}, 48 pp},
url = {https://www.waterquality.gov.au/sites/default/files/documents/warne-wqg-derivation2018.pdf}
}

@article{lepper2005manual,
Expand All @@ -188,14 +191,16 @@ @article{lepper2005manual
journal={Schmallenberg, Germany: Fraunhofer-Institute Molecular Biology and Applied Ecology},
volume={15},
pages={51--52},
year={2005}
year={2005},
url = {https://www.helpdeskwater.nl/publish/pages/131519/_16__manual_on_the_methodological_framework_to_derive_environmental_quality_standards_for_priori.pdf}
}

@techreport{bcmecc2019,
author = {{BC Ministry of Environment and Climate Change Strategy}},
title = {{Derivation of Water Quality Guidelines for the Protection of Aquatic Life in British Columbia}. Water Quality Guideline Series, WQG‐06},
year = {2019},
publisher = {Province of British Columbia, Victoria, BC, Canada},
url = {https://www2.gov.bc.ca/assets/gov/environment/air-land-water/water/waterquality/water-quality-guidelines/derivation-protocol/bc_wqg_aquatic_life_derivation_protocol.pdf&ved=2ahUKEwip7IfF_PCFAxUxqlYBHY0YBNMQFnoECBUQAQ&usg=AOvVaw16moKPwHywW1cutwlQaMoK}
}

@techreport{USEPA2020,
Expand Down
Loading

0 comments on commit b9409dc

Please sign in to comment.