From 3daeea597d196bcfd6a2d233396ba73c85922647 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Sun, 28 May 2023 10:31:02 +0000
Subject: [PATCH] Deprioritize OS recommendations (#2174)

Signed-off-by: Daniel Gray <dngray@privacyguides.org>
---
 config/mkdocs.en.yml               |  16 ++---
 config/mkdocs.es.yml               |  16 ++---
 config/mkdocs.fr.yml               |  16 ++---
 config/mkdocs.he.yml               |  16 ++---
 config/mkdocs.nl.yml               |  16 ++---
 config/mkdocs.offline.yml          |  16 ++---
 docs/basics/why-privacy-matters.md |   2 +-
 docs/tools.md                      | 110 ++++++++++++++---------------
 8 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/config/mkdocs.en.yml b/config/mkdocs.en.yml
index b1152137..28e26d82 100644
--- a/config/mkdocs.en.yml
+++ b/config/mkdocs.en.yml
@@ -107,15 +107,15 @@ 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'
@@ -123,10 +123,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - Operating Systems:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - Providers:
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/config/mkdocs.es.yml b/config/mkdocs.es.yml
index ac14c8bf..59b225de 100644
--- a/config/mkdocs.es.yml
+++ b/config/mkdocs.es.yml
@@ -107,15 +107,15 @@ 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'
@@ -123,10 +123,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - Sistemas operativos:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - Proveedores:
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/config/mkdocs.fr.yml b/config/mkdocs.fr.yml
index 1ae9f7b8..c0487799 100644
--- a/config/mkdocs.fr.yml
+++ b/config/mkdocs.fr.yml
@@ -107,15 +107,15 @@ 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'
@@ -123,10 +123,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - "Systèmes d'exploitation":
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - "Fournisseurs":
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/config/mkdocs.he.yml b/config/mkdocs.he.yml
index 68e823c3..f2012fe8 100644
--- a/config/mkdocs.he.yml
+++ b/config/mkdocs.he.yml
@@ -111,15 +111,15 @@ 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'
@@ -127,10 +127,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - "מערכות הפעלה":
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - "ספקים":
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/config/mkdocs.nl.yml b/config/mkdocs.nl.yml
index 91e4296d..2d5f5557 100644
--- a/config/mkdocs.nl.yml
+++ b/config/mkdocs.nl.yml
@@ -107,15 +107,15 @@ 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'
@@ -123,10 +123,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - Besturings systemen:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - Providers:
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/config/mkdocs.offline.yml b/config/mkdocs.offline.yml
index d57b5ffa..ad506425 100644
--- a/config/mkdocs.offline.yml
+++ b/config/mkdocs.offline.yml
@@ -95,15 +95,15 @@ 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'
@@ -111,10 +111,6 @@ nav:
       - 'tor.md'
       - 'desktop-browsers.md'
       - 'mobile-browsers.md'
-    - Operating Systems:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
     - Providers:
       - 'cloud.md'
       - 'dns.md'
@@ -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'
diff --git a/docs/basics/why-privacy-matters.md b/docs/basics/why-privacy-matters.md
index b71b7f0d..f8b896e4 100644
--- a/docs/basics/why-privacy-matters.md
+++ b/docs/basics/why-privacy-matters.md
@@ -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
 
diff --git a/docs/tools.md b/docs/tools.md
index 87fae6f3..4110c29e 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -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
@@ -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)