Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprioritize OS recommendations #2174

Merged
merged 1 commit into from May 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions config/mkdocs.en.yml
Expand Up @@ -107,26 +107,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- Operating Systems:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- Advanced Topics:
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- Operating Systems:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- Recommendations:
- 'tools.md'
- Internet Browsing:
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- Operating Systems:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Providers:
- 'cloud.md'
- 'dns.md'
Expand All @@ -149,6 +145,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- Operating Systems:
- 'android.md'
- 'desktop.md'
- 'router.md'
- About:
- 'about/index.md'
- 'about/criteria.md'
Expand Down
16 changes: 8 additions & 8 deletions config/mkdocs.es.yml
Expand Up @@ -107,26 +107,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- Sistemas operativos:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- Temas avanzados:
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- Sistemas operativos:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- Recomendaciones:
- 'tools.md'
- "Navegación por Internet":
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- Sistemas operativos:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Proveedores:
- 'cloud.md'
- 'dns.md'
Expand All @@ -149,6 +145,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- Sistemas operativos:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Acerca de:
- 'about/index.md'
- 'about/criteria.md'
Expand Down
16 changes: 8 additions & 8 deletions config/mkdocs.fr.yml
Expand Up @@ -107,26 +107,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- "Systèmes d'exploitation":
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- "Sujets avancés":
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- "Systèmes d'exploitation":
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- Recommandations:
- 'tools.md'
- Navigation internet:
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- "Systèmes d'exploitation":
- 'android.md'
- 'desktop.md'
- 'router.md'
- "Fournisseurs":
- 'cloud.md'
- 'dns.md'
Expand All @@ -149,6 +145,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- "Systèmes d'exploitation":
- 'android.md'
- 'desktop.md'
- 'router.md'
- "À propos":
- 'about/index.md'
- 'about/criteria.md'
Expand Down
16 changes: 8 additions & 8 deletions config/mkdocs.he.yml
Expand Up @@ -111,26 +111,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- "מערכות הפעלה":
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- "נושאים מתקדמים":
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- "מערכות הפעלה":
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- "המלצות":
- 'tools.md'
- "גלישה באינטרנט":
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- "מערכות הפעלה":
- 'android.md'
- 'desktop.md'
- 'router.md'
- "ספקים":
- 'cloud.md'
- 'dns.md'
Expand All @@ -153,6 +149,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- "מערכות הפעלה":
- 'android.md'
- 'desktop.md'
- 'router.md'
- "על אודות":
- 'about/index.md'
- 'about/criteria.md'
Expand Down
16 changes: 8 additions & 8 deletions config/mkdocs.nl.yml
Expand Up @@ -107,26 +107,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- Besturings systemen:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- Gevorderde onderwerpen:
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- Besturings systemen:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- Recommendaties:
- 'tools.md'
- Surfen op het internet:
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- Besturings systemen:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Providers:
- 'cloud.md'
- 'dns.md'
Expand All @@ -149,6 +145,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- Besturings systemen:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Over ons:
- 'about/index.md'
- 'about/criteria.md'
Expand Down
16 changes: 8 additions & 8 deletions config/mkdocs.offline.yml
Expand Up @@ -95,26 +95,22 @@ nav:
- 'basics/multi-factor-authentication.md'
- 'basics/email-security.md'
- 'basics/vpn-overview.md'
- Operating Systems:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- Advanced Topics:
- 'advanced/dns-overview.md'
- 'advanced/tor-overview.md'
- 'advanced/payments.md'
- 'advanced/communication-network-types.md'
- Operating Systems:
- 'os/android-overview.md'
- 'os/linux-overview.md'
- 'os/qubes-overview.md'
- kb-archive.md
- Recommendations:
- 'tools.md'
- Internet Browsing:
- 'tor.md'
- 'desktop-browsers.md'
- 'mobile-browsers.md'
- Operating Systems:
- 'android.md'
- 'desktop.md'
- 'router.md'
- Providers:
- 'cloud.md'
- 'dns.md'
Expand All @@ -137,6 +133,10 @@ nav:
- 'productivity.md'
- 'real-time-communication.md'
- 'video-streaming.md'
- Operating Systems:
- 'android.md'
- 'desktop.md'
- 'router.md'
- About:
- 'about/index.md'
- 'about/criteria.md'
Expand Down
2 changes: 1 addition & 1 deletion docs/basics/why-privacy-matters.md
Expand Up @@ -28,7 +28,7 @@ Many people get the concepts of **privacy**, **security**, and **anonymity** con

All of these concepts overlap, but it is possible to have any combination of these. The sweet spot for most people is when all three of these concepts overlap. However, it's tricker to achieve than many initially believe. Sometimes, you have to compromise on some of these, and that's okay too. This is where **threat modeling** comes into play, allowing you to make informed decisions about the [software and services](../tools.md) you use.

[:material-book-outline: Learn More About Threat Modeling](basics/threat-modeling.md){ .md-button }
[:material-book-outline: Learn More About Threat Modeling](threat-modeling.md){ .md-button }

## Privacy vs. Secrecy

Expand Down
110 changes: 55 additions & 55 deletions docs/tools.md
Expand Up @@ -70,61 +70,6 @@ For more details about each project, why they were chosen, and additional tips o

[Learn more :material-arrow-right-drop-circle:](mobile-browsers.md#adguard)

## Operating Systems

### Mobile

<div class="grid cards" markdown>

- ![GrapheneOS logo](assets/img/android/grapheneos.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/grapheneos-dark.svg#only-dark){ .twemoji } [GrapheneOS](android.md#grapheneos)
- ![DivestOS logo](assets/img/android/divestos.svg){ .twemoji } [DivestOS](android.md#divestos)

</div>

[Learn more :material-arrow-right-drop-circle:](android.md)

#### Android Apps

<div class="grid cards" markdown>

- ![Aurora Store logo](assets/img/android/aurora-store.webp){ .twemoji } [Aurora Store (Google Play Client)](android.md#aurora-store)
- ![Shelter logo](assets/img/android/mini/shelter.svg){ .twemoji } [Shelter (Work Profiles)](android.md#shelter)
- ![Auditor logo](assets/img/android/auditor.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/auditor-dark.svg#only-dark){ .twemoji } [Auditor (Supported Devices)](android.md#auditor)
- ![Secure Camera logo](assets/img/android/secure_camera.svg#only-light){ .twemoji }![Secure Camera logo](assets/img/android/secure_camera-dark.svg#only-dark){ .twemoji } [Secure Camera](android.md#secure-camera)
- ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/secure_pdf_viewer-dark.svg#only-dark){ .twemoji } [Secure PDF Viewer](android.md#secure-pdf-viewer)

</div>

[Learn more :material-arrow-right-drop-circle:](android.md#general-apps)

### Desktop/PC

<div class="grid cards" markdown>

- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os)
- ![Fedora logo](assets/img/linux-desktop/fedora-workstation.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation)
- ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji } [OpenSUSE Tumbleweed](desktop.md#opensuse-tumbleweed)
- ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji } [Arch Linux](desktop.md#arch-linux)
- ![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ .twemoji } [Fedora Silverblue & Kinoite](desktop.md#fedora-silverblue)
- ![nixOS logo](assets/img/linux-desktop/nixos.svg){ .twemoji } [NixOS](desktop.md#nixos)
- ![Whonix logo](assets/img/linux-desktop/whonix.svg){ .twemoji } [Whonix (Tor)](desktop.md#whonix)
- ![Tails logo](assets/img/linux-desktop/tails.svg){ .twemoji } [Tails (Live Boot)](desktop.md#tails)

</div>

[Learn more :material-arrow-right-drop-circle:](desktop.md)

### Router Firmware

<div class="grid cards" markdown>

- ![OpenWrt logo](assets/img/router/openwrt.svg#only-light){ .twemoji }![OpenWrt logo](assets/img/router/openwrt-dark.svg#only-dark){ .twemoji } [OpenWrt](router.md#openwrt)
- ![OPNsense logo](assets/img/router/opnsense.svg){ .twemoji } [OPNsense](router.md#opnsense)

</div>

[Learn more :material-arrow-right-drop-circle:](router.md)

## Service Providers

### Cloud Storage
Expand Down Expand Up @@ -474,3 +419,58 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
</div>

[Learn more :material-arrow-right-drop-circle:](video-streaming.md)

## Operating Systems

### Mobile

<div class="grid cards" markdown>

- ![GrapheneOS logo](assets/img/android/grapheneos.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/grapheneos-dark.svg#only-dark){ .twemoji } [GrapheneOS](android.md#grapheneos)
- ![DivestOS logo](assets/img/android/divestos.svg){ .twemoji } [DivestOS](android.md#divestos)

</div>

[Learn more :material-arrow-right-drop-circle:](android.md)

#### Android Apps

<div class="grid cards" markdown>

- ![Aurora Store logo](assets/img/android/aurora-store.webp){ .twemoji } [Aurora Store (Google Play Client)](android.md#aurora-store)
- ![Shelter logo](assets/img/android/mini/shelter.svg){ .twemoji } [Shelter (Work Profiles)](android.md#shelter)
- ![Auditor logo](assets/img/android/auditor.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/auditor-dark.svg#only-dark){ .twemoji } [Auditor (Supported Devices)](android.md#auditor)
- ![Secure Camera logo](assets/img/android/secure_camera.svg#only-light){ .twemoji }![Secure Camera logo](assets/img/android/secure_camera-dark.svg#only-dark){ .twemoji } [Secure Camera](android.md#secure-camera)
- ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/secure_pdf_viewer-dark.svg#only-dark){ .twemoji } [Secure PDF Viewer](android.md#secure-pdf-viewer)

</div>

[Learn more :material-arrow-right-drop-circle:](android.md#general-apps)

### Desktop/PC

<div class="grid cards" markdown>

- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os)
- ![Fedora logo](assets/img/linux-desktop/fedora-workstation.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation)
- ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji } [OpenSUSE Tumbleweed](desktop.md#opensuse-tumbleweed)
- ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji } [Arch Linux](desktop.md#arch-linux)
- ![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ .twemoji } [Fedora Silverblue & Kinoite](desktop.md#fedora-silverblue)
- ![nixOS logo](assets/img/linux-desktop/nixos.svg){ .twemoji } [NixOS](desktop.md#nixos)
- ![Whonix logo](assets/img/linux-desktop/whonix.svg){ .twemoji } [Whonix (Tor)](desktop.md#whonix)
- ![Tails logo](assets/img/linux-desktop/tails.svg){ .twemoji } [Tails (Live Boot)](desktop.md#tails)

</div>

[Learn more :material-arrow-right-drop-circle:](desktop.md)

### Router Firmware

<div class="grid cards" markdown>

- ![OpenWrt logo](assets/img/router/openwrt.svg#only-light){ .twemoji }![OpenWrt logo](assets/img/router/openwrt-dark.svg#only-dark){ .twemoji } [OpenWrt](router.md#openwrt)
- ![OPNsense logo](assets/img/router/opnsense.svg){ .twemoji } [OPNsense](router.md#opnsense)

</div>

[Learn more :material-arrow-right-drop-circle:](router.md)