diff --git a/.editorconfig b/.editorconfig index f5c794c0..85fe6c4f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2024 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 # EditorConfig is awesome: https://EditorConfig.org diff --git a/.gitattributes b/.gitattributes index 5c3e1ad6..54b7c347 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 # Auto detect text files and perform LF normalization * text=auto diff --git a/.github/ISSUE_TEMPLATE/1_Content_Correction.yml b/.github/ISSUE_TEMPLATE/1_Content_Correction.yml index 2bbe1d80..6984fadf 100644 --- a/.github/ISSUE_TEMPLATE/1_Content_Correction.yml +++ b/.github/ISSUE_TEMPLATE/1_Content_Correction.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2023 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC0-1.0 name: "Content Correction" description: Report any inaccurate, incorrect, or outdated information on the website. diff --git a/.github/ISSUE_TEMPLATE/2_Website_Issues.yml b/.github/ISSUE_TEMPLATE/2_Website_Issues.yml index b8e673da..999968ef 100644 --- a/.github/ISSUE_TEMPLATE/2_Website_Issues.yml +++ b/.github/ISSUE_TEMPLATE/2_Website_Issues.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2023 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC0-1.0 name: "Website Issue" description: Report a bug with the website. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6afedf15..b15dabc7 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC0-1.0 blank_issues_enabled: false contact_links: diff --git a/.github/PULL_REQUEST_TEMPLATE.md.license b/.github/PULL_REQUEST_TEMPLATE.md.license index 06fe45ad..7e39341d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md.license +++ b/.github/PULL_REQUEST_TEMPLATE.md.license @@ -1,4 +1,4 @@ -SPDX-FileCopyrightText: 2017 Privacy Guides project contributors +SPDX-FileCopyrightText: 2017 Contributors to Privacy Guides SPDX-FileCopyrightText: 2020 Jonah Aragon -SPDX-License-Identifier: MIT +SPDX-License-Identifier: MIT OR CC0-1.0 diff --git a/.gitignore b/.gitignore index 84c2f9d7..94a6a191 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2019 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 site /i18n/ diff --git a/.markdownlint.yml b/.markdownlint.yml index 232aab7f..e3a511d1 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 default: true line-length: false diff --git a/CITATION.cff b/CITATION.cff index e73598f5..1cacd320 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 cff-version: 1.2.0 title: Privacy Guides diff --git a/Pipfile b/Pipfile index 54533ebb..26352023 100644 --- a/Pipfile +++ b/Pipfile @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 [[source]] url = "https://pypi.org/simple" diff --git a/README.md b/README.md index 65e03bd1..500fbc5c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -90,20 +90,10 @@ All contributors to the site are listed [here](#contributors). If you have contr ## License -Copyright © 2019 - 2024 [Privacy Guides contributors](#contributors). - -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). - -Generally speaking, **content** can be found in the [`/docs`](/docs), [`/theme/assets/img`](/theme/assets/img) and [`/includes`](/includes) 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://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.* +This repository is [REUSE compliant](https://reuse.software/), meaning each file is individually annotated with copyright information. Typically, most content you would read on the site is [**CC BY-SA 4.0**](LICENSES/CC-BY-SA-4.0.txt). You must always check the copyright license information in each file you copy before using it in your own work. If you are confused about who owns the copyright for a particular file or what license it is available under, please email . 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 The only supported method of building and previewing this website locally is by running the automatic dev container. The easiest way to do this in your web browser without installing any software is to use [GitHub Codespaces](https://codespaces.new/privacyguides/privacyguides.org). To build the website locally, you will need the following software: diff --git a/REUSE.toml b/REUSE.toml index 70d90a94..cf2785a3 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -1,26 +1,5 @@ -# SPDX-FileCopyrightText: 2025 Jonah Aragon -# -# SPDX-License-Identifier: MIT - version = 1 -# Fallback -[[annotations]] -path = [ - "docs/*", - "docs/advanced/*", - "docs/android/*", - "docs/basics/*", - "docs/os/**", - "docs/self-hosting/*" -] -SPDX-FileCopyrightText = [ - "Privacy Guides ", - "Contributors to Privacy Guides " -] -SPDX-License-Identifier = "CC-BY-SA-4.0" -SPDX-FileContributor = "Jonah Aragon " - # Computer-generated files and other files which cannot be copyrighted [[annotations]] path = [ @@ -41,29 +20,38 @@ precedence = "override" SPDX-FileCopyrightText = "NONE" SPDX-License-Identifier = "CC0-1.0" -# Privacy Guides Employee Works +# Privacy Guides Paid Work - Fria [[annotations]] path = [ - "videos/posts/**", - "blog/assets/images/clearing-your-browsing-data/*", - "blog/assets/images/cryptpad-review/*", "blog/assets/images/digital-provenance/*", - "blog/assets/images/clearing-your-browsing-data/*", - "blog/assets/images/in-praise-of-tor/*", - "blog/assets/images/installing-and-using-tails/*", - "blog/assets/images/installing-keepassxc-and-yubikey/*", - "blog/assets/images/interview-with-micah-lee/*", - "blog/assets/images/keepassium-review/*", - "blog/assets/images/clearing-your-browsing-data/*", - "blog/assets/images/mastodon-privacy-and-security/*", - "blog/assets/images/mastodon-tutorial-privacy-and-security/*", - "blog/assets/images/privacy-pass/*", - "blog/assets/images/yubikey-reset-and-backup/*", + "blog/assets/images/privacy-pass/*" ] SPDX-FileCopyrightText = "Privacy Guides " SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Fria " -# 2024 Jonah Aragon +# Privacy Guides Paid Work - Kevin +[[annotations]] +path = [ + "blog/assets/images/clearing-your-browsing-data/*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Kevin Pham " + +# Privacy Guides Paid Work - Jordan +[[annotations]] +path = [ + "videos/posts/**" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = [ + "Jordan Warne ", + "Jonah Aragon " +] + +# 2024 Jonah Aragon [[annotations]] path = [ "includes/strings.en.env" diff --git a/blog/.authors.yml b/blog/.authors.yml index a90bfc3e..71202ccc 100644 --- a/blog/.authors.yml +++ b/blog/.authors.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2024 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 authors: aprilfools: diff --git a/blog/assets/images/cryptpad-review/REUSE.toml b/blog/assets/images/cryptpad-review/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/cryptpad-review/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/in-praise-of-tor/REUSE.toml b/blog/assets/images/in-praise-of-tor/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/in-praise-of-tor/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/installing-and-using-tails/REUSE.toml b/blog/assets/images/installing-and-using-tails/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/installing-and-using-tails/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/installing-keepassxc-and-yubikey/REUSE.toml b/blog/assets/images/installing-keepassxc-and-yubikey/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/installing-keepassxc-and-yubikey/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/interview-with-micah-lee/REUSE.toml b/blog/assets/images/interview-with-micah-lee/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/interview-with-micah-lee/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/keepassium-review/REUSE.toml b/blog/assets/images/keepassium-review/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/keepassium-review/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/mastodon-privacy-and-security/REUSE.toml b/blog/assets/images/mastodon-privacy-and-security/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/mastodon-privacy-and-security/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/mastodon-privacy-and-security/mastodon-cover.webp.license b/blog/assets/images/mastodon-privacy-and-security/mastodon-cover.webp.license new file mode 100644 index 00000000..299563a8 --- /dev/null +++ b/blog/assets/images/mastodon-privacy-and-security/mastodon-cover.webp.license @@ -0,0 +1,5 @@ +SPDX-FileCopyrightText: Privacy Guides + +SPDX-License-Identifier: CC-BY-SA-4.0 AND LicenseRef-FairUse +SPDX-FileComment: This file contains the Mastodon logo, which is used under fair use. +SPDX-FileContributor: Mastodon gGmbH diff --git a/blog/assets/images/mastodon-tutorial-privacy-and-security/REUSE.toml b/blog/assets/images/mastodon-tutorial-privacy-and-security/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/mastodon-tutorial-privacy-and-security/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/blog/assets/images/mastodon-tutorial-privacy-and-security/mastodon-tutorial-cover.webp.license b/blog/assets/images/mastodon-tutorial-privacy-and-security/mastodon-tutorial-cover.webp.license new file mode 100644 index 00000000..42d2a677 --- /dev/null +++ b/blog/assets/images/mastodon-tutorial-privacy-and-security/mastodon-tutorial-cover.webp.license @@ -0,0 +1,7 @@ +SPDX-FileCopyrightText: Privacy Guides + +SPDX-License-Identifier: CC-BY-SA-4.0 AND LicenseRef-FairUse +SPDX-FileComment: Mastodon mascot by @dopatwo@mastodon.social and Mastodon logo used with permission from Mastodon gGmbH. This site is not otherwise affiliated with Mastodon gGmbH. +SPDX-FileContributor: Em +SPDX-FileContributor: dopatwo +SPDX-FileContributor: Mastodon gGmbH diff --git a/blog/assets/images/yubikey-reset-and-backup/REUSE.toml b/blog/assets/images/yubikey-reset-and-backup/REUSE.toml new file mode 100644 index 00000000..9ab23edf --- /dev/null +++ b/blog/assets/images/yubikey-reset-and-backup/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 + +# Privacy Guides Paid Work - Em +[[annotations]] +path = [ + "*" +] +SPDX-FileCopyrightText = "Privacy Guides " +SPDX-License-Identifier = "CC-BY-SA-4.0" +SPDX-FileContributor = "Em " diff --git a/crowdin.yml b/crowdin.yml index 073000e5..4f82b2e8 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2023 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 #checkov:skip=CKV_SECRET_6:obviously a variable name and not a secret api_token_env: CROWDIN_PERSONAL_TOKEN diff --git a/generate-topics.sh b/generate-topics.sh index 5cf38898..205c17d5 100755 --- a/generate-topics.sh +++ b/generate-topics.sh @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2025 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 DATE_CMD="date" diff --git a/includes/abbreviations.en.txt b/includes/abbreviations.en.txt index 20461c74..eb15a2d8 100644 --- a/includes/abbreviations.en.txt +++ b/includes/abbreviations.en.txt @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2023 Contributors to Privacy Guides SPDX-FileCopyrightText: 2024 Fria SPDX-FileCopyrightText: 2024 redoomed1 -SPDX-FileCopyrightText: 2024 @I-I-IT -SPDX-FileCopyrightText: 2024 @xe-3 +SPDX-FileCopyrightText: 2024 @I-I-IT +SPDX-FileCopyrightText: 2024 @xe-3 SPDX-License-Identifier: CC-BY-SA-4.0 --> diff --git a/mkdocs.blog.yml b/mkdocs.blog.yml index 582f4741..c4f2f2af 100644 --- a/mkdocs.blog.yml +++ b/mkdocs.blog.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 docs_dir: "blog" site_url: "https://www.privacyguides.org/articles/" diff --git a/mkdocs.insiders.yml b/mkdocs.insiders.yml index d3dccd1b..e3e0ff22 100644 --- a/mkdocs.insiders.yml +++ b/mkdocs.insiders.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 INHERIT: mkdocs.yml diff --git a/mkdocs.videos.yml b/mkdocs.videos.yml index f9955387..d39c15f9 100644 --- a/mkdocs.videos.yml +++ b/mkdocs.videos.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 docs_dir: "videos" site_url: "https://www.privacyguides.org/videos/" diff --git a/mkdocs.yml b/mkdocs.yml index cdfcb59d..e1fa54e6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2022 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC-BY-SA-4.0 docs_dir: !ENV [BUILD_DOCS_DIR, "docs"] site_url: !ENV [BUILD_SITE_URL, "https://www.privacyguides.org/en/"] diff --git a/theme/video.html b/theme/video.html index 9c4d7d06..99843867 100644 --- a/theme/video.html +++ b/theme/video.html @@ -1,7 +1,7 @@ {% extends "main.html" %} diff --git a/videos/index.md b/videos/index.md index f0f30c21..7bdef95f 100644 --- a/videos/index.md +++ b/videos/index.md @@ -1,7 +1,7 @@ --- # SPDX-FileCopyrightText: 2025 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: CC-BY-SA-4.0 description: >- This is our home for the latest video content from the Privacy Guides team. Be sure you are subscribed to find out about our latest uploads, and share these videos with your family and friends if you find them helpful! template: video.html diff --git a/videos/posts/.meta.yml b/videos/posts/.meta.yml index 2a12da39..da4d2770 100644 --- a/videos/posts/.meta.yml +++ b/videos/posts/.meta.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2025 Jonah Aragon # -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR CC0-1.0 template: video-post.html hide: