diff --git a/CITATION.cff b/CITATION.cff index 90ca824f..76b1d351 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 @@ -30,6 +30,9 @@ authors: - name: The Privacy Guides team website: 'https://github.com/orgs/privacyguides/people' repository-code: 'https://github.com/privacyguides/privacyguides.org' +license: + - MIT + - CC-BY-SA-4.0 references: - authors: - family-names: Donath @@ -41,16 +44,15 @@ preferred-citation: type: website title: Privacy Guides authors: - - email: jonah@privacyguides.org - given-names: Jonah + - given-names: Jonah family-names: Aragon + email: jonah@privacyguides.org 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 + - 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 @@ -64,4 +66,4 @@ preferred-citation: - encryption - website - markdown - license: "CC-BY-ND-4.0" + license: CC-BY-SA-4.0 diff --git a/LICENSE b/LICENSE index 6c5a1fed..795087c2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Attribution-NoDerivatives 4.0 International +Attribution-ShareAlike 4.0 International ======================================================================= @@ -33,7 +33,7 @@ exhaustive, and do not form part of our licenses. material not subject to the license. This includes other CC- licensed material, or material used under an exception or limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors + wiki.creativecommons.org/Considerations_for_licensors Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the @@ -50,17 +50,16 @@ exhaustive, and do not form part of our licenses. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public: - wiki.creativecommons.org/Considerations_for_licensees - + wiki.creativecommons.org/Considerations_for_licensees ======================================================================= -Creative Commons Attribution-NoDerivatives 4.0 International Public +Creative Commons Attribution-ShareAlike 4.0 International Public License By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons -Attribution-NoDerivatives 4.0 International Public License ("Public +Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You @@ -81,7 +80,15 @@ Section 1 -- Definitions. Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. - b. Copyright and Similar Rights means copyright and/or similar rights + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or @@ -89,29 +96,33 @@ Section 1 -- Definitions. specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. - c. Effective Technological Measures means those measures that, in the + e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. - d. Exceptions and Limitations means fair use, fair dealing, and/or + f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. - e. Licensed Material means the artistic or literary work, database, + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. - f. Licensed Rights means the rights granted to You subject to the + i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. - g. Licensor means the individual(s) or entity(ies) granting rights + j. Licensor means the individual(s) or entity(ies) granting rights under this Public License. - h. Share means to provide material to the public by any means or + k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material @@ -119,13 +130,13 @@ Section 1 -- Definitions. public may access the material from a place and at a time individually chosen by them. - i. Sui Generis Database Rights means rights other than copyright + l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. - j. You means the individual or entity exercising the Licensed Rights + m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. @@ -141,7 +152,7 @@ Section 2 -- Scope. a. reproduce and Share the Licensed Material, in whole or in part; and - b. produce and reproduce, but not Share, Adapted Material. + b. produce, reproduce, and Share Adapted Material. 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public @@ -171,7 +182,13 @@ Section 2 -- Scope. Licensed Rights under the terms and conditions of this Public License. - b. No downstream restrictions. You may not offer or impose + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the @@ -213,7 +230,8 @@ following conditions. a. Attribution. - 1. If You Share the Licensed Material, You must: + 1. If You Share the Licensed Material (including in modified + form), You must: a. retain the following if it is supplied by the Licensor with the Licensed Material: @@ -241,9 +259,6 @@ following conditions. Public License, and include the text of, or the URI or hyperlink to, this Public License. - For the avoidance of doubt, You do not have permission under - this Public License to Share Adapted Material. - 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be @@ -255,6 +270,25 @@ following conditions. information required by Section 3(a)(1)(A) to the extent reasonably practicable. + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + Section 4 -- Sui Generis Database Rights. @@ -263,13 +297,13 @@ apply to Your use of the Licensed Material: a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database, provided You do not Share - Adapted Material; + portion of the contents of the database; b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material; and + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. @@ -370,23 +404,24 @@ Section 8 -- Interpretation. that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + ======================================================================= -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the “Licensor.” The text of the Creative Commons public +licenses is dedicated to the public domain under the CC0 Public Domain +Dedication. Except for the limited purpose of indicating that material +is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark "Creative Commons" or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. +the avoidance of doubt, this paragraph does not form part of the public +licenses. Creative Commons may be contacted at creativecommons.org. 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..7175b34c 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,17 @@ Our current list of team members can be found [here](https://www.privacyguides.o Copyright © 2019 - 2023 [Privacy Guides contributors](https://github.com/privacyguides/privacyguides.org/graphs/contributors). -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). +Privacy Guides content is licensed under the [Creative Commons Attribution-ShareAlike 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 licensed under [`LICENSE-CODE`](/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..6a7a1c2d 100644 --- a/_redirects +++ b/_redirects @@ -9,7 +9,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..41aa3957 100644 --- a/config/mkdocs.en.yml +++ b/config/mkdocs.en.yml @@ -29,9 +29,8 @@ 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. - - Content licensed under CC BY-ND 4.0. + © 2019 - 2023 Privacy Guides and contributors. + This website is open source. edit_uri: edit/main/docs/ extra: diff --git a/docs/about/index.md b/docs/about/index.md index 7d2e59e6..59d16e0f 100644 --- a/docs/about/index.md +++ b/docs/about/index.md @@ -81,8 +81,10 @@ 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 "" -: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. + The following is a human-readable summary of (and not a substitute for) the [license](https://www.privacyguides.org/license). -This license is in place to prevent people from sharing our work without giving proper credit, and to prevent people from modifying our work in a way that could be used to mislead people. If you find the terms of this license too restrictive for the project you're working on, please reach out to us at `jonah@privacyguides.org`. We are happy to provide alternative licensing options for well-intentioned projects in the privacy space! +:fontawesome-brands-creative-commons: :fontawesome-brands-creative-commons-by: :fontawesome-brands-creative-commons-sa: Unless otherwise noted, the original content on this website is made available under the [Creative Commons Attribution-ShareAlike 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 share your work under the same license. + +You may comply with these terms in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. diff --git a/docs/about/notices.md b/docs/about/notices.md index 63b443d2..4819e8bf 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 "" -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: + The following is a human-readable summary of (and not a substitute for) the [license](https://www.privacyguides.org/license). -* [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). +**Content** on this website is released under the [Creative Commons Attribution-ShareAlike 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/tree/main/LICENSE). This means that you can use the human-readable content on this website for your own project, as long as you give appropriate credit to [Privacy Guides](https://www.privacyguides.org) including a link where technically possible, and you release your project under the same license. You may not do so in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides brand trademarks in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo. -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). +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 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. +This does not include third-party code embedded in the Privacy Guides code 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/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). 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://github.com/github/opensource.guide/blob/master/LICENSE).*