From 37632d93ec0bf85dada8317441fc8a5e20b0a977 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Thu, 23 Mar 2023 01:39:01 -0500 Subject: [PATCH] Update website metadata (#2098) --- CITATION.cff | 73 ++++++++++++++++++++++++++++----------- Pipfile | 2 +- README.md | 18 ++++++++-- _redirects | 25 +++++++++++++- config/mkdocs.en.yml | 4 +-- config/mkdocs.fr.yml | 4 +-- config/mkdocs.he.yml | 4 +-- config/mkdocs.nl.yml | 4 +-- config/mkdocs.offline.yml | 4 +-- docs/about/index.md | 8 ++--- docs/about/notices.md | 23 +++++++----- 11 files changed, 121 insertions(+), 48 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 90ca824f..545916d6 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Jonah Aragon +# Copyright (c) 2022-2023 Jonah Aragon # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -20,38 +20,69 @@ cff-version: 1.2.0 title: Privacy Guides -message: 'If you reference this website, please cite it in your work.' +message: "If you reference this website, please cite it in your work." type: software authors: - - email: jonah@privacyguides.org + - family-names: Aragon given-names: Jonah - family-names: Aragon - orcid: 'https://orcid.org/0000-0001-6996-4965' - - name: The Privacy Guides team - website: 'https://github.com/orgs/privacyguides/people' -repository-code: 'https://github.com/privacyguides/privacyguides.org' + website: "https://www.jonaharagon.com" + orcid: "https://orcid.org/0000-0001-6996-4965" + - name: The Privacy Guides Team + website: "https://github.com/orgs/privacyguides/people" +repository-code: "https://github.com/privacyguides/privacyguides.org" +license: + - MIT + - CC-BY-ND-4.0 references: - authors: - family-names: Donath given-names: Martin - title: 'mkdocs-material' + title: "mkdocs-material" type: software - repository-code: 'https://github.com/squidfunk/mkdocs-material' + repository-code: "https://github.com/squidfunk/mkdocs-material" + license: MIT preferred-citation: type: website title: Privacy Guides authors: - - email: jonah@privacyguides.org + - family-names: Aragon given-names: Jonah - family-names: Aragon - orcid: 'https://orcid.org/0000-0001-6996-4965' - - given-names: Daniel - family-names: Gray - email: dngray@privacyguides.org - - name: The Privacy Guides team - website: 'https://github.com/orgs/privacyguides/people' - - name: Various project contributors - url: 'https://www.privacyguides.org' + website: "https://www.jonaharagon.com" + orcid: "https://orcid.org/0000-0001-6996-4965" + - family-names: Gray + given-names: Daniel + alias: dngray + website: "https://polarbear.army" + - family-names: Wilde + given-names: Niek + name-particle: de + alias: blacklight447 + - given-names: Freddy + website: "https://freddy.lol" + - alias: mfwmyfacewhen + website: "https://github.com/mfwmyfacewhen" + - given-names: Olivia + alias: hook + - alias: nitrohorse + website: "https://nitrohorse.com" + - family-names: Suomalainen + given-names: Aminda + alias: Mikaela + website: "https://aminda.eu" + - family-names: Potocki + given-names: Dawid + website: "https://dawidpotocki.com" + - alias: matchboxbananasynergy + website: "https://banana.omg.lol" + - family-names: Tran + given-names: Thien + alias: Tommy + website: "https://tommytran.io" + - alias: samsepi0l + website: "https://github.com/d4rklynk" + - name: Privacy Guides Contributors + website: "https://github.com/privacyguides/privacyguides.org/graphs/contributors" + url: "https://www.privacyguides.org" abstract: >- Privacy Guides is a socially motivated website that provides information for protecting your data @@ -64,4 +95,4 @@ preferred-citation: - encryption - website - markdown - license: "CC-BY-ND-4.0" + license: CC-BY-ND-4.0 diff --git a/Pipfile b/Pipfile index 642aeccb..e7cbf8a3 100644 --- a/Pipfile +++ b/Pipfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Jonah Aragon +# Copyright (c) 2022-2023 Jonah Aragon # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/README.md b/README.md index 223a2a78..b33f1a7e 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,11 @@ ## About -**Privacy Guides** is a socially motivated website that provides information for protecting your data security and privacy. We are a non-profit collective operated entirely by volunteer team members and contributors. +**Privacy Guides** is a socially motivated website that provides information for protecting your data security and privacy. Our mission is to inform the public about the value of digital privacy, and global government initiatives which aim to monitor your online activity. We are a non-profit collective operated entirely by volunteer team members and contributors. Our website is free of advertisements and not affiliated with any of the listed providers. -Our current list of team members can be found [here](https://www.privacyguides.org/about/#our-team). Additionally, [many people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) have made contributions to the project, and you can too! +The current list of team members can be found [here](https://www.privacyguides.org/about/#our-team). Additionally, [many people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) have made contributions to the project, and you can too! + +*Featured on: [Tweakers](https://tweakers.net/reviews/10568/op-zoek-naar-privacyvriendelijke-tools-niek-de-wilde-van-privacy-guides.html), [The New York Times](https://www.nytimes.com/wirecutter/guides/online-security-social-media-privacy/), and [Wired](https://www.wired.com/story/firefox-mozilla-2022/)* ## Contributing @@ -51,6 +53,8 @@ Our current list of team members can be found [here](https://www.privacyguides.o - Browse our [open issues](https://github.com/privacyguides/privacyguides.org/issues) to see what needs to be updated - View some contribution tips on our [contributor's wiki](https://github.com/privacyguides/privacyguides.org/wiki) +All contributors to the site are listed [here](https://github.com/privacyguides/privacyguides.org/graphs/contributors). If you make a substantial (i.e. copyright eligible) contribution to the project and would like to be formally credited, you are welcome to include your information in the appropriate `authors` section in [`CITATION.cff`](/CITATION.cff) as well, just submit a PR or ask @jonaharagon to make the change. + ## Mirrors [![GitHub](https://img.shields.io/static/v1?logo=github&label=&message=GitHub&color=000&style=for-the-badge)](https://github.com/privacyguides/privacyguides.org) @@ -65,7 +69,15 @@ Copyright © 2019 - 2023 [Privacy Guides contributors](https://github.com/pr Privacy Guides content is licensed under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](/LICENSE), and the underlying source code used to format and display that content on [www.privacyguides.org](https://www.privacyguides.org) is licensed under the [MIT License](/LICENSE-CODE). -[More info...](https://www.privacyguides.org/en/about/notices/#licenses) +Generally speaking, **content** can be found in the [`/docs`](/docs), [`/theme/assets/img`](/theme/assets/img), [`/includes`](/includes), and [`/i18n`](/i18n) folders; and **source code** and configuration files can be found in the [`/config`](/config) and [`/theme`](/theme) folders, and in the root of this repository. Any source code snippets contained within documentation files are [MIT Licensed](/LICENSE-CODE). Please contact us if you require clarification on any of these terms. + +These licenses do not apply to any work where another license is otherwise noted. + +**Logos** in the [`/theme/assets/img`](/theme/assets/img) folder may not be original works of Privacy Guides and therefore cannot be (re)licensed by us. We believe that these logos obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://www.copyright.gov/fair-use/more-info.html) allows the use of copyrighted images in order to identify the subject for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.* + +You may comply with our license terms in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides branding in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo. + +When you contribute to this repository you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project. ## Developing diff --git a/_redirects b/_redirects index 96027b63..625b804f 100644 --- a/_redirects +++ b/_redirects @@ -1,3 +1,25 @@ +# Copyright (c) 2023 Jonah Aragon + +# 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 NON-INFRINGEMENT. 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. + +# Auto detect text files and perform LF normalization + / /en/ 302 Language=en / /fr/ 302 Language=fr / /he/ 302 Language=he @@ -9,7 +31,8 @@ /kb /en/basics/threat-modeling/ /:lang/kb /:lang/basics/threat-modeling/ -/coc/ /en/CODE_OF_CONDUCT/ +/coc /en/CODE_OF_CONDUCT/ +/license https://github.com/privacyguides/privacyguides.org/tree/main/README.md#license /team /en/about/ /browsers /en/desktop-browsers/ diff --git a/config/mkdocs.en.yml b/config/mkdocs.en.yml index 3ca7ebfa..ab239415 100644 --- a/config/mkdocs.en.yml +++ b/config/mkdocs.en.yml @@ -29,9 +29,9 @@ site_description: | copyright: | Privacy Guides is a non-profit, socially motivated website that provides information for protecting your data security and privacy.
We do not make money from recommending certain products, and we do not use affiliate links.
- © 2022 Privacy Guides and contributors. + © 2019 - 2023 Privacy Guides and contributors. - Content licensed under CC BY-ND 4.0. + Content licensed under CC BY-ND 4.0. edit_uri: edit/main/docs/ extra: diff --git a/config/mkdocs.fr.yml b/config/mkdocs.fr.yml index 315ff25a..e5bfdc64 100644 --- a/config/mkdocs.fr.yml +++ b/config/mkdocs.fr.yml @@ -29,9 +29,9 @@ site_description: | copyright: | Privacy Guides is a non-profit, socially motivated website that provides information for protecting your data security and privacy.
We do not make money from recommending certain products, and we do not use affiliate links.
- © 2022 Privacy Guides and contributors. + © 2019 - 2023 Privacy Guides and contributors. - Content licensed under CC BY-ND 4.0. + Content licensed under CC BY-ND 4.0. edit_uri: edit/main/i18n/fr/ extra: diff --git a/config/mkdocs.he.yml b/config/mkdocs.he.yml index 26108682..10ca2342 100644 --- a/config/mkdocs.he.yml +++ b/config/mkdocs.he.yml @@ -29,9 +29,9 @@ site_description: | copyright: | Privacy Guides is a non-profit, socially motivated website that provides information for protecting your data security and privacy.
We do not make money from recommending certain products, and we do not use affiliate links.
- © 2022 Privacy Guides and contributors. + © 2019 - 2023 Privacy Guides and contributors. - Content licensed under CC BY-ND 4.0. + Content licensed under CC BY-ND 4.0. edit_uri: edit/main/i18n/he/ extra: diff --git a/config/mkdocs.nl.yml b/config/mkdocs.nl.yml index 2052cf6a..e7c5fcaa 100644 --- a/config/mkdocs.nl.yml +++ b/config/mkdocs.nl.yml @@ -29,9 +29,9 @@ site_description: | copyright: | Privacy Guides is een non-profit, sociaal gemotiveerde website die informatie biedt voor de bescherming van jouw gegevensbeveiliging en privacy.
Wij verdienen geen geld met het aanbevelen van bepaalde producten, en wij maken geen gebruik van affiliate links.
- © 2022 Privacy Guides en medewerkers. + © 2019 - 2023 Privacy Guides en medewerkers. - Inhoud gelicentieerd onder CC BY-ND 4.0. + Inhoud gelicentieerd onder CC BY-ND 4.0. edit_uri: edit/main/docs/ extra: diff --git a/config/mkdocs.offline.yml b/config/mkdocs.offline.yml index f9a15611..993f3f4f 100644 --- a/config/mkdocs.offline.yml +++ b/config/mkdocs.offline.yml @@ -29,9 +29,9 @@ site_description: | copyright: | Privacy Guides is a non-profit, socially motivated website that provides information for protecting your data security and privacy.
We do not make money from recommending certain products, and we do not use affiliate links.
- © 2022 Privacy Guides and contributors. + © 2019 - 2023 Privacy Guides and contributors. - Content licensed under CC BY-ND 4.0. + Content licensed under CC BY-ND 4.0. repo_url: "" extra: diff --git a/docs/about/index.md b/docs/about/index.md index 7d2e59e6..c2e869da 100644 --- a/docs/about/index.md +++ b/docs/about/index.md @@ -5,14 +5,12 @@ description: Privacy Guides is a socially motivated website that provides inform --- ![Privacy Guides logo](../assets/brand/png/square/pg-yellow.png){ align=right } -**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any listed providers. +**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. Our mission is to inform the public about the value of digital privacy, and global government initiatives which aim to monitor your online activity. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any of the listed providers. [:octicons-home-16:](https://www.privacyguides.org/){ .card-link title=Homepage } [:octicons-code-16:](https://github.com/privacyguides/privacyguides.org){ .card-link title="Source Code" } [:octicons-heart-16:](donate.md){ .card-link title=Contribute } -The purpose of Privacy Guides is to educate our community on the importance of privacy online and government programs internationally that are designed to monitor all of your online activities. - > To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies. — [New York Times](https://www.nytimes.com/wirecutter/guides/online-security-social-media-privacy/) @@ -81,7 +79,9 @@ Our team members review all changes made to the website and handle administrativ ## Site License -*The following is a human-readable summary of (and not a substitute for) the [license](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE):* +!!! danger "" + + The following is a human-readable summary of (and not a substitute for) the [license](/license). :fontawesome-brands-creative-commons: :fontawesome-brands-creative-commons-by: :fontawesome-brands-creative-commons-nd: Unless otherwise noted, the original content on this website is made available under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). This means that you are free to copy and redistribute the material in any medium or format for any purpose, even commercially; as long as you give appropriate credit to `Privacy Guides (www.privacyguides.org)` and provide a link to the license. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. If you remix, transform, or build upon the content of this website, you may not distribute the modified material. diff --git a/docs/about/notices.md b/docs/about/notices.md index 63b443d2..9ccae1ae 100644 --- a/docs/about/notices.md +++ b/docs/about/notices.md @@ -1,7 +1,5 @@ --- title: "Notices and Disclaimers" -hide: - - toc --- ## Legal Disclaimer @@ -14,21 +12,26 @@ Privacy Guides is an open source project contributed to under licenses that incl Privacy Guides additionally does not warrant that this website will be constantly available, or available at all. -## Licenses +## Licensing Overview -Unless otherwise noted, all content on this website is made available under the terms of the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). +!!! danger "" + + The following is a human-readable summary of (and not a substitute for) the [license](/license). + +Unless otherwise noted, all **content** on this website is made available under the terms of the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). The underlying **source code** used to generate this website and display that content is released under the [MIT License](https://github.com/privacyguides/privacyguides.org/tree/main/LICENSE-CODE). This does not include third-party code embedded in this repository, or code where a superseding license is otherwise noted. The following are notable examples, but this list may not be all-inclusive: -* [MathJax](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/mathjax.js) is licensed under the [Apache License 2.0](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/LICENSE.mathjax.txt). - -Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE). +* [MathJax](https://github.com/privacyguides/privacyguides.org/blob/main/theme/assets/javascripts/mathjax.js) is licensed under the [Apache License 2.0](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/LICENSE.mathjax.txt). +* The [Bagnard](https://github.com/privacyguides/brand/tree/main/WOFF/bagnard) heading font is licensed under the [SIL Open Font License 1.1](https://github.com/privacyguides/brand/blob/main/WOFF/bagnard/LICENSE.txt). +* The [Public Sans](https://github.com/privacyguides/brand/tree/main/WOFF/public_sans) font used for most text on the site is licensed under the terms detailed [here](https://github.com/privacyguides/brand/blob/main/WOFF/public_sans/LICENSE.txt). +* The [DM Mono](https://github.com/privacyguides/brand/tree/main/WOFF/dm_mono) font used for monospaced text on the site is licensed under the [SIL Open Font License 1.1](https://github.com/privacyguides/brand/blob/main/WOFF/dm_mono/LICENSE.txt). This means that you can use the human-readable content in this repository for your own project, per the terms outlined in the Creative Commons Attribution-NoDerivatives 4.0 International Public License text. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides branding in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo. We believe that the logos and other images in `assets` obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://www.copyright.gov/fair-use/more-info.html) allows the use of copyrighted images in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.* -When you contribute to this repository you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project. +When you contribute to our website you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project. ## Acceptable Use @@ -41,3 +44,7 @@ You must not conduct any systematic or automated data collection activities on o * Scraping * Data Mining * 'Framing' (IFrames) + +--- + +*Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://creativecommons.org/licenses/by-sa/4.0/).*