Skip to content

Commit 3d180c8

Browse files
authored
Merge branch 'main' into style-and-consistency
2 parents fff159f + a5d0346 commit 3d180c8

15 files changed

+339
-22
lines changed

.all-contributorsrc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,6 +2986,26 @@
29862986
"promotion",
29872987
"question"
29882988
]
2989+
},
2990+
{
2991+
"login": "Spirizer",
2992+
"name": "Spirizer",
2993+
"avatar_url": "https://avatars.githubusercontent.com/u/51120100?v=4",
2994+
"profile": "https://github.com/Spirizer",
2995+
"contributions": [
2996+
"translation"
2997+
]
2998+
},
2999+
{
3000+
"login": "jordbm",
3001+
"name": "jordbm",
3002+
"avatar_url": "https://avatars.githubusercontent.com/u/160433264?v=4",
3003+
"profile": "https://github.com/jordbm",
3004+
"contributions": [
3005+
"doc",
3006+
"maintenance",
3007+
"security"
3008+
]
29893009
}
29903010
],
29913011
"contributorsPerLine": 5,

.vscode/ltex.dictionary.en-US.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,3 +556,8 @@ Semiphemeral
556556
Dangerzone
557557
simple-activitypub
558558
ActivityPub
559+
pseudorandom
560+
Chaum
561+
unlinkability
562+
Kagi
563+
Secureblue

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ Privacy Guides wouldn't be possible without these wonderful people ([emoji key](
611611
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/bruch-alex"><img src="https://avatars.githubusercontent.com/u/173354246?v=4" width="100px;" loading=lazy /><br /><sub><b>Alex Bruch</b></sub></a><br /><a href="#translation-bruch-alex" title="Translation">🌍</a></td>
612612
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/qiyongzheng"><img src="https://avatars.githubusercontent.com/u/153378707?v=4" width="100px;" loading=lazy /><br /><sub><b>qiyongzheng</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=qiyongzheng" title="Documentation">📖</a></td>
613613
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/hashcatHitman"><img src="https://avatars.githubusercontent.com/u/155700084?v=4" width="100px;" loading=lazy /><br /><sub><b>Sam K</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=hashcatHitman" title="Documentation">📖</a> <a href="#promotion-hashcatHitman" title="Promotion">📣</a> <a href="#question-hashcatHitman" title="Answering Questions">💬</a></td>
614+
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/Spirizer"><img src="https://avatars.githubusercontent.com/u/51120100?v=4" width="100px;" loading=lazy /><br /><sub><b>Spirizer</b></sub></a><br /><a href="#translation-Spirizer" title="Translation">🌍</a></td>
615+
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/jordbm"><img src="https://avatars.githubusercontent.com/u/160433264?v=4" width="100px;" loading=lazy /><br /><sub><b>jordbm</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=jordbm" title="Documentation">📖</a> <a href="#maintenance-jordbm" title="Maintenance">🚧</a> <a href="#security-jordbm" title="Security">🛡️</a></td>
614616
</tr>
615617
</tbody>
616618
<tfoot>

blog/.authors.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ authors:
4040
name: fria
4141
description: Team Member
4242
avatar: https://github.com/friadev.png
43+
jordan:
44+
name: Jordan Warne
45+
description: Video Producer
46+
avatar: https://forum-cdn.privacyguides.net/user_avatar/discuss.privacyguides.net/jordan/288/7793_2.png
47+
mastodon:
48+
username: jw
49+
instance: social.lol
4350
jonah:
4451
name: Jonah Aragon
4552
description: Project Director
Binary file not shown.
115 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

blog/posts/privacy-pass.md

Lines changed: 245 additions & 0 deletions
Large diffs are not rendered by default.

docs/desktop.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@ Linux distributions are commonly recommended for privacy protection and software
1414

1515
## Traditional Distributions
1616

17-
### Fedora Workstation
17+
### Fedora Linux
1818

1919
<div class="admonition recommendation" markdown>
2020

2121
![Fedora logo](assets/img/linux-desktop/fedora.svg){ align=right }
2222

23-
**Fedora Workstation** is our recommended distribution for people new to Linux. Fedora generally adopts newer technologies (e.g., [Wayland](https://wayland.freedesktop.org) and [PipeWire](https://pipewire.org)) before other distributions. These new technologies often come with improvements in security, privacy, and usability in general.
23+
**Fedora Linux** is our recommended desktop distribution for people new to Linux. Fedora generally adopts newer technologies (e.g., [Wayland](https://wayland.freedesktop.org) and [PipeWire](https://pipewire.org)) before other distributions. These new technologies often come with improvements in security, privacy, and usability in general.
2424

25-
[:octicons-home-16: Homepage](https://fedoraproject.org/workstation){ .md-button .md-button--primary }
25+
[:octicons-home-16: Homepage](https://fedoraproject.org){ .md-button .md-button--primary }
2626
[:octicons-info-16:](https://docs.fedoraproject.org/en-US/docs){ .card-link title=Documentation}
2727
[:octicons-heart-16:](https://whatcanidoforfedora.org){ .card-link title=Contribute }
2828

2929
</details>
3030

3131
</div>
3232

33-
Fedora has a semi-rolling release cycle. While some packages like [GNOME](https://gnome.org) are frozen until the next Fedora release, most packages (including the kernel) are updated frequently throughout the lifespan of the release. Each Fedora release is supported for one year, with a new version released every 6 months.
33+
Fedora comes in two primary desktop editions, [Fedora Workstation](https://fedoraproject.org/workstation), which uses the GNOME desktop environment, and [Fedora KDE Plasma Desktop](https://fedoraproject.org/kde), which uses KDE. Historically, Fedora Workstation has been more popular and widely recommended, but KDE has been gaining in popularity and provides an experience more similar to Windows, which may make transitioning to Linux easier for some. The security and privacy benefits of both editions are very similar, so it mostly comes down to personal preference.
34+
35+
Fedora has a semi-rolling release cycle. While some packages like the desktop environment are frozen until the next Fedora release, most packages (including the kernel) are updated frequently throughout the lifespan of the release. Each Fedora release is supported for one year, with a new version released every 6 months.
3436

3537
### openSUSE Tumbleweed
3638

docs/tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
686686
<div class="grid cards" markdown>
687687

688688
- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji loading=lazy } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os)
689-
- ![Fedora logo](assets/img/linux-desktop/fedora.svg){ .twemoji loading=lazy } [Fedora Workstation](desktop.md#fedora-workstation)
689+
- ![Fedora logo](assets/img/linux-desktop/fedora.svg){ .twemoji loading=lazy } [Fedora Linux](desktop.md#fedora-linux)
690690
- ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji loading=lazy } [openSUSE Tumbleweed](desktop.md#opensuse-tumbleweed)
691691
- ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji loading=lazy } [Arch Linux](desktop.md#arch-linux)
692692
- ![Fedora logo](assets/img/linux-desktop/fedora.svg){ .twemoji loading=lazy } [Fedora Atomic Desktops](desktop.md#fedora-atomic-desktops)

includes/contributors.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,8 @@
450450
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/bruch-alex"><img src="https://avatars.githubusercontent.com/u/173354246?v=4" width="100px;" loading=lazy /><br /><sub><b>Alex Bruch</b></sub></a><br /><a href="#translation-bruch-alex" title="Translation">🌍</a></td>
451451
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/qiyongzheng"><img src="https://avatars.githubusercontent.com/u/153378707?v=4" width="100px;" loading=lazy /><br /><sub><b>qiyongzheng</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=qiyongzheng" title="Documentation">📖</a></td>
452452
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/hashcatHitman"><img src="https://avatars.githubusercontent.com/u/155700084?v=4" width="100px;" loading=lazy /><br /><sub><b>Sam K</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=hashcatHitman" title="Documentation">📖</a> <a href="#promotion-hashcatHitman" title="Promotion">📣</a> <a href="#question-hashcatHitman" title="Answering Questions">💬</a></td>
453+
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/Spirizer"><img src="https://avatars.githubusercontent.com/u/51120100?v=4" width="100px;" loading=lazy /><br /><sub><b>Spirizer</b></sub></a><br /><a href="#translation-Spirizer" title="Translation">🌍</a></td>
454+
<td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/jordbm"><img src="https://avatars.githubusercontent.com/u/160433264?v=4" width="100px;" loading=lazy /><br /><sub><b>jordbm</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=jordbm" title="Documentation">📖</a> <a href="#maintenance-jordbm" title="Maintenance">🚧</a> <a href="#security-jordbm" title="Security">🛡️</a></td>
453455
</tr>
454456
</tbody>
455457
<tfoot>

videos/.authors.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

videos/.authors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../blog/.authors.yml

videos/posts/is-privacy-dead.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
title: |
3+
Think Privacy Is Dead? You're Wrong.
4+
date:
5+
created: 2025-04-17T20:00:00Z
6+
authors:
7+
- jordan
8+
description: |
9+
Privacy isn’t dead, in fact it’s growing. In this video, we explore common arguments against protecting your privacy and why they're not only wrong but dangerous.
10+
readtime: 5
11+
thumbnail: https://neat.tube/lazy-static/previews/ebdd1d98-7136-4f5d-9a9e-449004ce47d1.jpg
12+
embed: https://neat.tube/videos/embed/sSx1yyXESXhvZh1E3VTwtG
13+
peertube: https://neat.tube/w/sSx1yyXESXhvZh1E3VTwtG
14+
youtube: https://www.youtube.com/watch?v=Ni2_BN_9xAY
15+
links:
16+
- Why Privacy Matters: https://www.privacyguides.org/en/basics/why-privacy-matters/
17+
- posts/5-easy-steps-to-protect-yourself-online.md
18+
---
19+
Privacy isn’t dead, in fact it’s growing. In this video, we explore common arguments against protecting your privacy and why they're not only wrong but dangerous.
20+
21+
## Sources
22+
23+
- <https://www.wired.com/story/google-app-gmail-chrome-data/>
24+
- <https://www.cloudflare.com/learning/privacy/what-is-the-gdpr/>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
title: |
3+
Is Your Data Really Safe? Understanding Encryption
4+
date:
5+
created: 2025-04-03T20:00:00Z
6+
authors:
7+
- jordan
8+
description: |
9+
Encryption is a cornerstone of security on the modern internet, in this video we dive deep into how it works and explain why it's so important.
10+
readtime: 7
11+
thumbnail: https://neat.tube/lazy-static/previews/f23bff89-bc84-46b7-ac0b-7e72a9c3ad7d.jpg
12+
embed: https://neat.tube/videos/embed/6gASFPMvy7EBwTiM3XetEZ
13+
peertube: https://neat.tube/w/6gASFPMvy7EBwTiM3XetEZ
14+
youtube: https://www.youtube.com/watch?v=0uQVzK8QWsw
15+
links:
16+
- Privacy Means Safety<br><small>by Em on March 5, 2025</small>: https://www.privacyguides.org/articles/2025/03/25/privacy-means-safety/
17+
- Why Privacy Matters: https://www.privacyguides.org/en/basics/why-privacy-matters/
18+
---
19+
Encryption is a cornerstone of security on the modern internet, in this video we dive deep into how it works and explain why it's so important. This is especially crucial as many governments around the world are pushing to ban encryption and breach our fundamental right to privacy.
20+
21+
## Sources
22+
23+
- <https://www.bbc.co.uk/news/articles/cgj54eq4vejo>
24+
- <https://www.eff.org/deeplinks/2025/02/uks-demands-apple-break-encryption-emergency-us-all>
25+
- <https://www.eff.org/deeplinks/2019/12/fancy-new-terms-same-old-backdoors-encryption-debate-2019>
26+
- <https://www.amnesty.org/en/latest/news/2025/02/https-www-amnesty-org-en-latest-news-2025-02-uk-encryption-order-threatens-global-privacy-rights/>

0 commit comments

Comments
 (0)