Update Quad9 logging information and DNS server footnotes (#1001)

Co-authored-by: Jonah Aragon <jonah@triplebit.net>

.gitattributes

@@ -1,2 +1,14 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+docs/** -linguist-documentation
+.git* text
+*.json text
+*.js text
+*.md text linguist-detectable
+*.{yml,yaml} text
+*.{htm,html} text diff=html
+
+*.svg text
+*.png binary
+*.{jpeg,jpg} binary

.github/workflows/build.yml

@@ -1,46 +0,0 @@
-name: Build Website
-on:
-  pull_request:
-    branches:
-      - main
-
-env:
-  PYTHON_VERSION: 3.x
-
-jobs:
-  build:
-    name: Build website
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Python runtime
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      
-      - name: Cache files
-        uses: actions/cache@v3.0.2
-        with:
-          key: ${{ github.ref }}
-          path: .cache
-
-      - name: Install Python dependencies
-        run: |
-          pip install mkdocs
-          pip install mkdocs-material
-
-      - name: Build website
-        run: |
-          mkdocs build
-          mv .well-known site/
-          tar cvf site.tar site
-          mkdocs --version
-
-      - name: Package website
-        uses: actions/upload-artifact@v3
-        with:
-          name: generated-site
-          path: site.tar

.github/workflows/crowdin.yml

@@ -0,0 +1,27 @@
+name: Crowdin Upload
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: crowdin action
+      uses: crowdin/github-action@1.4.8
+      with:
+        upload_sources: true
+        upload_sources_args: '--auto-update --delete-obsolete'
+        upload_translations: false
+        download_translations: false
+        config: crowdin.yml
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/deploy.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           pip install 'mkdocs>=1.3.0'
+          pip install mkdocs-static-i18n
 
       - name: Install mkdocs-material Insiders build
         if: github.event.repository.fork == false

CHANGELOG.md

@@ -1,20 +0,0 @@
-# Privacy Guides Changelog
-
-<!-- Add the date and any new changes to the TOP of this file, below this line. -->
-
-## 2022-04-12
-
-- Enabled organization discussions ([#986](https://github.com/orgs/privacyguides/discussions/986))
-- Added a navbar link to the new [organization discussions](https://github.com/orgs/privacyguides/discussions) ([#994](https://github.com/privacyguides/privacyguides.org/pull/994))
-
-## 2022-04-11
-
-- Added changelog
-- Switched to release-based deployments ([#987](https://github.com/privacyguides/privacyguides.org/pull/987))
-- Removed blog from repo, moved to [blog.privacyguides.org](https://blog.privacyguides.org) ([#985](https://github.com/privacyguides/privacyguides.org/pull/985))
-- Add RSS page ([#895](https://github.com/privacyguides/privacyguides.org/pull/895/))
-- MFA/YubiKey clarifications ([#972](https://github.com/privacyguides/privacyguides.org/pull/972))
-
----
-
-*Massive thanks to [u/SnowCatFalcon](https://www.reddit.com/user/SnowCatFalcon/) for publishing [changelogs on our Subreddit](https://www.reddit.com/r/PrivacyGuides/comments/tu2dvw/privacy_guides_changelogs_march_2022/) before we added this file.*

Pipfile

@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 mkdocs = "*"
 mkdocs-material = {path = "./mkdocs-material"}
+mkdocs-static-i18n = "*"
 
 [dev-packages]
 scour = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "18f7bfb9a1d405016b6c63e1253e974e974d3e67b8e8a6b98d132ac1e780c822"
+            "sha256": "57e0161a7d6dbb050b1a0ab71eaaf145b951010f8a3054dfab1c5f24d4a293cf"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -305,6 +305,13 @@
             "markers": "python_version >= '3.6'",
             "version": "==1.0.3"
         },
+        "mkdocs-static-i18n": {
+            "hashes": [
+                "sha256:0d97df64b5be7b34dc112d4ccfba28352b9fccd1b7a3babf229f30d25f6ebb36"
+            ],
+            "index": "pypi",
+            "version": "==0.44"
+        },
         "packaging": {
             "hashes": [
                 "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",

README.md

@@ -34,6 +34,9 @@
   </a>
   <a href="https://github.com/privacyguides/privacyguides.org/pulls?q=is%3Apr+is%3Aclosed">
     <img src="https://img.shields.io/github/issues-pr-closed-raw/privacyguides/privacyguides.org">
+  </a>
+  <a href="https://crowdin.com/project/privacyguides">
+    <img src="https://badges.crowdin.net/privacyguides/localized.svg">
   </a></p>
 </div>
 
@@ -47,6 +50,7 @@ Our current list of team members can be found [here](https://github.com/orgs/pri
 
 - 💬 [Start a discussion or suggest an idea](https://github.com/privacyguides/privacyguides.org/discussions)
 - 💖 [Sponsor the project](https://github.com/sponsors/privacyguides)
+- 🈴 [Help translate the site](https://crwd.in/privacyguides) [[Matrix chat](https://matrix.to/#/#pg-i18n:aragon.sh)]
 - 📝 Edit the site, everything's accessible in this repo
   - Browse our [open issues](https://github.com/privacyguides/privacyguides.org/issues) to see what needs to be updated
   - When making more significant (than simple typo fixes, etc.) changes, update the [changelog](/CHANGELOG.md)
@@ -54,16 +58,6 @@ Our current list of team members can be found [here](https://github.com/orgs/pri
 
 ## Developing
 
-1. Clone this repository: `git clone https://github.com/privacyguides/privacyguides.org`
-2. Install [Python 3.6+](https://www.python.org/downloads/)
-3. Install [mkdocs-material](https://squidfunk.github.io/mkdocs-material/getting-started/): `pip install mkdocs-material`
-4. Serve the site locally: `mkdocs serve`
-    - The site will be available at `http://localhost:8000/`
-  
-Your local site will appear slightly different, because the production version of the website uses a private/custom build of mkdocs-material with additional features.
-
-Team members with access to [mkdocs-material-insiders](https://github.com/privacyguides/mkdocs-material-insiders) should instead:
-
 1. Clone this repository and submodules: `git clone --recurse-submodules https://github.com/privacyguides/privacyguides.org`
 2. Install [Python 3.6+](https://www.python.org/downloads/)
 3. Install **pipenv**: `pip install pipenv`

crowdin.yml

@@ -0,0 +1,14 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+"preserve_hierarchy": true
+files:
+- source: "/docs/**/*.en.md"
+  translation: "/docs/**/%file_name%.%locale_with_underscore%.md"
+  translation_replace:
+    "en.": ""
+  update_option: update_as_unapproved
+- source: "/theme/overrides/*.en.html"
+  translation: "/theme/overrides/%file_name%.%locale_with_underscore%.html"
+  translation_replace:
+    "en.": ""
+  update_option: update_as_unapproved

docs/about/notices.en.md

@@ -1,8 +1,5 @@
 ---
-layout: page
-permalink: /terms-and-notices/
 title: "Notices and Disclaimers"
-description: "Privacy Guides is provided with good intentions on an "as-is" basis, without warranty, and disclaiming liability for damages."
 icon: material/message-alert
 hide:
     - toc
@@ -30,7 +27,7 @@ Portions of this notice itself were adopted from [opensource.guide](https://gith
 
 This means that you can use the human-readable content in this repository for your own project, per the terms outlined in the CC0 1.0 Universal text. 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.
 
-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://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image 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.*
+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://en.wikipedia.org/wiki/Fair_use) 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.
 

docs/about/privacy-policy.en.md

@@ -1,8 +1,5 @@
 ---
-layout: page
-permalink: /privacy-policy/
 title: "Privacy Policy"
-description: "This Privacy Statement explains what information Privacy Guides and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
 icon: material/file-search
 ---
 

docs/assets/img/social-media-aggregator/freepost.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.25 0 0 .25 26.227 -5.5792)"><path d="m30.557 85.535c0-9.0311-7.0959-18.062-17.74-18.062 0 0-7.0959 9.0311-7.0959 18.062 0 9.0311 7.0959 18.062 7.0959 18.062 10.644 0 17.74-9.0311 17.74-18.062z" style="fill:#775641;stroke-linejoin:round;stroke-width:.50032"/><path d="m23.762 85.819c0-7.1466-6.5632-13.107-14.304-13.107 0 0-3.7364 6.796-3.7364 13.32 0 6.5245 3.5955 11.731 3.5955 11.731 7.7409 0 14.445-4.7979 14.445-11.945z" style="fill:#f6eab7;stroke-linejoin:round;stroke-width:.36266"/><path d="m-104.91 85.535c0-9.0311 7.0959-18.062 17.74-18.062 0 0 7.0959 9.0311 7.0959 18.062 0 9.0311-7.0959 18.062-7.0959 18.062-10.644 0-17.74-9.0311-17.74-18.062z" style="fill:#775641;stroke-linejoin:round;stroke-width:.50032"/><path d="m-98.115 85.819c0-7.1466 6.5632-13.107 14.304-13.107 0 0 3.7364 6.796 3.7364 13.321 0 6.5245-3.5955 11.731-3.5955 11.731-7.7409 0-14.445-4.7979-14.445-11.945z" style="fill:#f6eab7;stroke-linejoin:round;stroke-width:.36266"/><path d="m-37.177 31.348c-25.158 0-50.316 9.5839-50.316 38.336 1.1924 6.4728 2.7731 11.683 4.6475 15.865-7.5968 3.7523-13.034 10.248-13.034 21.274 0 33.544 33.544 41.93 58.702 41.93s58.702-8.386 58.702-41.93c0-11.026-5.4368-17.521-13.034-21.274 1.8744-4.1813 3.4552-9.3917 4.6475-15.865 0-28.752-25.158-38.336-50.316-38.336z" style="fill:#775641"/><path d="m-55.239 42.637c-14.963-2e-6 -24.836 12.13-24.836 27.093 0.0068 6.4722 2.3304 12.728 6.5501 17.636-8.7707 4.271-15.581 10.809-15.581 20.747 0 24.836 26.771 33.867 51.929 33.867 25.158 0 51.929-9.0311 51.929-33.867 0-9.9374-6.8105-16.476-15.581-20.747 4.2197-4.9075 6.5432-11.163 6.5501-17.636 0-14.963-9.8723-27.093-24.836-27.093-9.0311 0-13.461 3.4642-18.062 6.7733-4.6083-3.3145-11.289-6.7733-18.062-6.7733z" style="fill:#f6eab7;stroke-linejoin:round;stroke-width:1.0285"/><ellipse cx="-54.11" cy="74.246" rx="5.6444" ry="9.0311" style="fill:#775641;stroke-linejoin:round;stroke-width:.89246"/><ellipse cx="-20.243" cy="74.246" rx="5.6444" ry="9.0311" style="fill:#775641;stroke-linejoin:round;stroke-width:.89246"/><path d="m-71.233 110.23c12.984 13.436 55.127 13.436 68.112 0 0 0-5.0706 4.6382-16.903 7.1405-11.833 2.5023-17.153 2.034-17.153 2.034s-5.3106 0.35654-16.366-2.034c-11.055-2.3905-17.69-7.1405-17.69-7.1405z" style="fill:#775641;stroke-linejoin:round;stroke-width:4.1379;stroke:#775641"/></g></svg>

docs/assets/img/social-media-aggregator/lemmy.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;">
-    <g id="Layer-1" serif:id="Layer 1" transform="matrix(0.7115,0,0,0.7115,-4.30398,-12.0468)">
-        <path id="white-border" d="M31.32,50.773C31.142,50.772 30.965,50.773 30.788,50.777C29.979,50.791 29.177,50.844 28.385,50.935C22.051,51.665 16.345,55.035 12.847,60.924C9.42,66.695 8.576,73.049 10.323,78.937C12.07,84.825 16.302,90.174 22.566,94.412C22.604,94.437 22.643,94.462 22.682,94.485C28.054,97.725 33.403,99.91 39.133,101.039C38.993,103.404 38.997,105.834 39.149,108.323C39.606,115.843 42.263,122.767 46.292,128.886L31.853,134.781C30.295,135.392 29.539,137.159 30.171,138.708C30.803,140.256 32.58,140.989 34.12,140.336L50.001,133.853C52.946,137.364 56.33,140.543 59.961,143.335C60.1,143.441 60.241,143.545 60.38,143.651L51.078,155.968C50.055,157.289 50.309,159.191 51.643,160.198C52.976,161.205 54.875,160.929 55.866,159.584L65.314,147.074C70.505,150.362 76.015,152.925 81.452,154.621C84.243,159.736 89.697,162.992 96,162.992C102.363,162.992 107.82,159.489 110.588,154.473C115.97,152.746 121.416,150.173 126.553,146.898L136.134,159.584C137.125,160.929 139.024,161.205 140.357,160.198C141.691,159.191 141.945,157.289 140.922,155.968L131.479,143.464C131.542,143.417 131.605,143.37 131.668,143.323C135.256,140.576 138.61,137.456 141.55,134.016L157.03,140.336C158.57,140.989 160.347,140.256 160.98,138.708C161.612,137.159 160.855,135.392 159.298,134.781L145.322,129.075C149.479,122.92 152.266,115.944 152.848,108.364C153.041,105.86 153.079,103.409 152.968,101.019C158.66,99.883 163.977,97.706 169.318,94.485C169.357,94.462 169.396,94.437 169.434,94.412C175.698,90.174 179.93,84.825 181.677,78.937C183.424,73.049 182.58,66.695 179.153,60.924C175.655,55.035 169.949,51.665 163.615,50.935C162.823,50.844 162.021,50.791 161.212,50.777C155.548,50.675 149.505,52.431 143.694,55.786C139.419,58.253 135.565,62.032 132.549,66.155C124.112,61.327 113.135,58.608 99.647,58.385C98.437,58.365 97.207,58.365 95.957,58.386C80.922,58.631 68.885,61.481 59.794,66.634C59.771,66.599 59.748,66.563 59.724,66.528C56.67,62.26 52.71,58.328 48.306,55.786C42.677,52.536 36.829,50.786 31.32,50.773L31.32,50.773Z" style="fill:none;fill-rule:nonzero;stroke:white;stroke-width:5.25px;"/>
-        <path id="ears" d="M134.41,68.056C137.277,64.049 141.041,60.348 145.006,58.059C157.506,50.843 170.698,51.83 176.896,62.265C183.101,72.712 179.706,84.294 167.963,92.237C161.971,95.85 156.163,98.035 149.732,98.902M57.59,68.056C54.722,64.049 50.959,60.348 46.994,58.059C34.494,50.843 21.302,51.83 15.104,62.265C8.899,72.712 12.294,84.294 24.037,92.237C30.029,95.85 35.837,98.035 42.268,98.902" style="fill:white;fill-rule:nonzero;stroke:black;stroke-width:5.25px;"/>
-        <path id="head" d="M150.231,108.163C152.388,80.076 135.11,60.372 96,61.01C56.89,61.649 40.071,80.256 41.769,108.163C43.39,134.803 74.919,154.364 95.792,154.364C116.664,154.364 148.189,134.762 150.231,108.163Z" style="fill:white;fill-rule:nonzero;stroke:black;stroke-width:5.25px;"/>
-        <path id="eyes" d="M114.469,120.804C114.469,125.138 117.976,128.651 122.302,128.651C126.629,128.651 130.136,125.138 130.136,120.804C130.136,116.471 126.629,112.958 122.302,112.958C117.976,112.958 114.469,116.471 114.469,120.804ZM61.864,120.804C61.864,125.178 65.403,128.723 69.77,128.723C74.136,128.723 77.676,125.178 77.676,120.804C77.676,116.431 74.136,112.885 69.77,112.885C65.403,112.885 61.864,116.431 61.864,120.804Z" style="fill-rule:nonzero;"/>
-        <path id="whiskers" d="M63.699,144.234L53.472,157.776M128.301,144.234L138.528,157.776M49.441,130.841L32.986,137.558M141.71,130.841L158.164,137.558" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:6px;stroke-linejoin:miter;"/>
-        <path id="nose" d="M96,133.704C87.401,133.704 81.913,139.675 82.099,147.036C82.299,155.007 88.186,160.368 96,160.368C103.814,160.368 109.885,154.181 109.902,147.036C109.919,139.673 104.6,133.704 96,133.704Z" style="fill:white;fill-rule:nonzero;stroke:black;stroke-width:5.25px;"/>
-    </g>
-</svg>

docs/assets/img/social-media-aggregator/tildes.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g stroke-width=".33866"><rect x="-5.6458e-7" y="-5.6458e-7" width="33.866" height="33.866" fill="#002b36"/><rect x="-5.6458e-7" y="16.933" width="4.2333" height="4.2333" fill="#859900"/><rect x="4.2332" y="12.7" width="4.2333" height="4.2333" fill="#2aa198"/><rect x="8.4665" y="8.4665" width="4.2333" height="4.2333" fill="#268bd2"/><rect x="12.7" y="12.7" width="4.2333" height="4.2333" fill="#6c71c4"/><rect x="16.933" y="16.933" width="4.2333" height="4.2333" fill="#d33682"/><rect x="21.166" y="21.166" width="4.2333" height="4.2333" fill="#dc322f"/><rect x="25.399" y="16.933" width="4.2333" height="4.2333" fill="#cb4b16"/><rect x="29.633" y="12.7" width="4.2333" height="4.2333" fill="#b58900"/></g></svg>

docs/assets/img/social-networks/diaspora.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(2 0 0 2 0 -560.12)"><circle cx="8.4667" cy="288.53" r="8.4667" fill="#3e4142" stroke-width=".38887"/><path d="m6.1306 293.62c-0.61195-0.40183-1.8023-1.3484-1.8383-1.4618-0.0175-0.0552 0.11761-0.25886 0.87712-1.3223 0.59137-0.82801 0.98432-1.3965 0.98432-1.424 0-0.01-0.4186-0.15726-0.93021-0.32777-1.5987-0.53278-2.1871-0.75809-2.2228-0.85129-0.0085-0.0222 0.02478-0.17879 0.07399-0.34805 0.16758-0.57651 0.70469-2.1925 0.72869-2.1925 0.01317 0 0.69903 0.22409 1.5242 0.49799 0.82512 0.27389 1.5369 0.50097 1.5818 0.50462 0.08051 7e-3 0.08184 5e-3 0.09981-0.11496 0.02567-0.17145 0.06852-1.3039 0.06863-1.8139 5e-5 -0.23526 0.0073-0.65934 0.016121-0.94238l0.016029-0.51464h2.7084l0.01692 1.1613c0.01638 1.1246 0.04908 2.0391 0.07784 2.1766 0.0077 0.0367 0.02929 0.0669 0.04798 0.0669 0.018709 0 0.4419-0.13256 0.94045-0.29459 1.1784-0.38294 1.6299-0.52224 1.9278-0.5948 0.22766-0.0555 0.24515-0.0565 0.27379-0.0177 0.11772 0.15956 0.87772 2.4073 0.82859 2.4506-0.08778 0.0772-0.64949 0.28794-1.8198 0.68268-1.3815 0.46598-1.3376 0.45035-1.3376 0.47651 0 0.0359 0.24771 0.39668 0.9244 1.3466 0.34304 0.48151 0.69854 0.98791 0.78999 1.1253l0.16629 0.2498-0.07093 0.0743c-0.28961 0.30347-1.9257 1.5297-2.041 1.5297-0.05832 0-0.32962-0.32111-0.76323-0.90341-0.23554-0.31633-0.59006-0.79236-0.78783-1.0579-0.19776-0.26553-0.3985-0.52655-0.44609-0.58004l-0.08653-0.0973-0.08516 0.0973c-0.11446 0.13074-0.58016 0.74722-0.99206 1.3132-0.56457 0.77581-0.94676 1.2524-1.0043 1.2524-0.013449 0-0.12479-0.0659-0.24742-0.1464z" fill="#fff" stroke-width=".024319"/></g></svg>

docs/assets/img/social-networks/friendica.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#ffc019" d="M23.04 2.56c-11.508.055-20.48 9.027-20.48 20.48v81.92c0 11.673 8.972 20.48 20.48 20.48h20.48V92.16h40.96l-.108-30.633-40.853.215V35.839h40.96V2.56H23.036Z"/><path fill="#1872a2" d="M104.96 125.441c11.508 0 20.59-8.916 20.48-20.48V23.042c.1-11.541-9.046-20.48-20.48-20.48H84.48v33.28H43.52v28.16h40.96v28.16H43.52v33.28h61.441Z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="5.12" d="M84.482 2.56v33.28h-40.96V64m40.96 0v28.16h-40.96v33.28"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="5.12" d="M23.04 2.56h81.918c11.311 0 20.48 9.17 20.48 20.48v81.918c0 11.311-9.169 20.48-20.48 20.48H23.04c-11.31 0-20.48-9.169-20.48-20.48V23.04c0-11.31 9.17-20.48 20.48-20.48Z"/><path fill="none" d="M22.035 2.56h83.929c10.755 0 19.475 8.72 19.475 19.476v22.542c0 10.756-8.72 19.476-19.475 19.476h-83.93c-10.755 0-19.474-8.72-19.474-19.476V22.036C2.56 11.28 11.28 2.56 22.035 2.56ZM22.035 125.441h83.929c10.755 0 19.475-8.687 19.475-19.404V83.575c0-10.717-8.72-19.405-19.475-19.405h-83.93C11.28 64.17 2.56 72.858 2.56 83.575v22.462c0 10.717 8.72 19.404 19.475 19.404Z"/><linearGradient id="a" x1="58.714" x2="70.659" y1="-1.227" y2="37.471" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff" stop-opacity=".744"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><filter id="b" width="128" height="128" x="0" y="0" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" primitiveUnits="userSpaceOnUse"><feGaussianBlur stdDeviation="1.22"/></filter><path fill="url(#a)" d="M19.92-1.227c-3.062 0-5.946.448-8.531 1.227h11.654C10.885 0 .926 9.43.07 21.371v1.205c0 6.97 8.852 12.582 19.85 12.582h88.16c10.998 0 19.85-5.611 19.85-12.582V21.32C127.05 9.403 117.104 0 104.963 0h11.65c-2.585-.778-5.47-1.226-8.532-1.226H19.92Z" filter="url(#b)"/><linearGradient id="c" x1="69.089" x2="57.65" y1="125.276" y2="93.395" gradientUnits="userSpaceOnUse"><stop offset="0" stop-opacity=".5"/><stop offset="1" stop-color="#818080" stop-opacity="0"/></linearGradient><filter id="d" width="128" height="128" x="0" y="0" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" primitiveUnits="userSpaceOnUse"><feGaussianBlur stdDeviation="1.457"/></filter><path fill="url(#c)" d="M21.566 97.022h85.002c9.673 0 17.515 6.325 17.515 14.127 0 7.802-7.842 14.127-17.515 14.127H21.566c-9.673 0-17.515-6.325-17.515-14.127 0-7.802 7.842-14.127 17.515-14.127Z" filter="url(#d)" opacity=".567"/></svg>

docs/assets/img/social-networks/mastodon.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><path d="m32.056 20.303c-0.46437 2.389-4.1591 5.0036-8.4025 5.5103-2.2128 0.26403-4.3914 0.50671-6.7145 0.40015-3.7993-0.17407-6.7972-0.90685-6.7972-0.90685 0 0.36986 0.02281 0.72202 0.06843 1.0514 0.49393 3.7495 3.7179 3.9741 6.7718 4.0788 3.0824 0.10546 5.827-0.75997 5.827-0.75997l0.12663 2.7866s-2.156 1.1577-5.9967 1.3707c-2.1179 0.11641-4.7476-0.05328-7.8104-0.86397-6.6428-1.7582-7.7853-8.8392-7.9601-16.024-0.05328-2.1332-0.02044-4.1447-0.02044-5.827 0-7.3468 4.8136-9.5002 4.8136-9.5002 2.4272-1.1147 6.5919-1.5834 10.922-1.6188h0.10638c4.3297 0.0354 8.4972 0.50415 10.924 1.6188 0 0 4.8134 2.1535 4.8134 9.5002 0 0 0.0604 5.4205-0.67129 9.1838" fill="#2b90d9" stroke-width=".14597"/><path d="m27.05 11.689v8.8957h-3.5243v-8.6343c0-1.8201-0.76581-2.7439-2.2976-2.7439-1.6936 0-2.5425 1.0959-2.5425 3.2628v4.726h-3.5035v-4.726c0-2.167-0.84901-3.2628-2.5427-3.2628-1.5318 0-2.2976 0.92382-2.2976 2.7439v8.6343h-3.5243v-8.8957c0-1.8181 0.46292-3.2628 1.3928-4.3317 0.95886-1.0689 2.2146-1.6168 3.7734-1.6168 1.8035 0 3.1692 0.69319 4.0723 2.0797l0.87784 1.4716 0.87802-1.4716c0.90284-1.3866 2.2686-2.0797 4.0723-2.0797 1.5586 0 2.8143 0.54794 3.7734 1.6168 0.92966 1.0689 1.3926 2.5136 1.3926 4.3317" fill="#fff" stroke-width=".14597"/></svg>

docs/assets/img/social-networks/movim.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient4049" x1="40" x2="200" y1="40" y2="200" gradientUnits="userSpaceOnUse"><stop style="stop-color:#345cca" offset="0"/><stop style="stop-color:#5d47c6" offset="1"/></linearGradient><linearGradient id="linearGradient4057" x1="125" x2="174.95" y1="65" y2="210.1" gradientUnits="userSpaceOnUse"><stop style="stop-color:#344394" offset="0"/><stop style="stop-color:#7c45df" offset="1"/></linearGradient><filter id="filter4029" x="-.14248" y="-.24435" width="1.285" height="1.4887"><feGaussianBlur stdDeviation="10.685972"/></filter></defs><g transform="matrix(.15187 0 0 .15187 -1.2909 -124.66)"><circle transform="translate(0 812.36)" cx="120" cy="120" r="110" style="fill:url(#linearGradient4049);stroke-width:3;stroke:url(#linearGradient4057)"/><path transform="matrix(.91667 0 0 .91667 3.3333 73.963)" d="m109.28 887.56c-20.51 0-37.137 16.627-37.137 37.137 0 1.594 0.10688 3.1707 0.30171 4.7118-0.29375-9e-3 -0.58624-0.0232-0.88201-0.0232-17.434-7e-5 -31.567 14.133-31.567 31.567 0 17.434 14.133 31.567 31.567 31.567h122.44c14.357 0 25.996-11.639 25.996-25.996 0-14.357-11.639-25.996-25.996-25.996-0.0468 0-0.093-2.5e-4 -0.13928 0 0.0334-0.64832 0.0696-1.293 0.0696-1.9497 0-20.51-16.627-37.137-37.137-37.137-5.7242 0-11.15 1.3077-15.992 3.6209-6.5596-10.507-18.221-17.501-31.52-17.501z" style="fill:#332949;filter:url(#filter4029);opacity:.45896"/><path d="m101.59 885.71c-18.232 0-33.011 14.78-33.011 33.011 0 1.4169 0.095 2.8184 0.26819 4.1883-0.26111-8e-3 -0.5211-0.0206-0.78401-0.0206-15.497-9e-5 -28.059 12.562-28.059 28.059 0 15.497 12.563 28.059 28.059 28.059h108.83c12.762 0 23.108-10.346 23.108-23.108 0-12.762-10.346-23.108-23.108-23.108-0.0416 0-0.0827-2.2e-4 -0.1238 0 0.0297-0.57629 0.0619-1.1493 0.0619-1.7331 0-18.231-14.78-33.011-33.011-33.011-5.0882 0-9.9111 1.1624-14.215 3.2186-5.8308-9.3396-16.197-15.556-28.018-15.556z" style="fill:#fff"/></g></svg>

docs/assets/img/social-networks/pleroma.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.1014 0 0 .1014 -9.0749 -9.0242)"><g fill="#fba457" stroke-width="0"><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m33.916 0a9.9641 9.9641 0 0 0-9.9648 9.9648v118.04h31.809v-128h-21.844z"/><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m71.855 0v64h22.229a9.9641 9.9641 0 0 0 9.9648-9.9648v-54.035h-32.193z"/><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m71.855 96.191v31.809h22.229a9.9641 9.9641 0 0 0 9.9648-9.9648v-21.844h-32.193z"/></g></g></svg>

docs/browsers.en.md

@@ -1,5 +1,5 @@
 ---
-title: Browser Recommendations
+title: "Web Browsers"
 icon: octicons/browser-16
 ---
 These are our current web browser recommendations and settings. We recommend keeping extensions to a minimum: they have privileged access within your browser, require you to trust the developer, can make you [stand out](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint), and [weaken](https://groups.google.com/a/chromium.org/g/chromium-extensions/c/0ei-UCHNm34/m/lDaXwQhzBAAJ) site isolation.

docs/calendar-contacts.en.md

@@ -1,5 +1,5 @@
 ---
-title: Calendar and Contact Sync Tools
+title: "Calendar and Contact Sync"
 icon: material/calendar
 ---
 Calendaring and contacts are some of the most sensitive data posess. Use only products that use end-to-end encryption (E2EE) at rest. This prevents a provider from reading your data.

docs/cloud.en.md

@@ -1,5 +1,5 @@
 ---
-title: Cloud Storage
+title: "Cloud Storage"
 icon: material/file-cloud
 ---
 If you are currently using a Cloud Storage Service like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you are putting complete trust in your service provider to not look at your files.

docs/dns.en.md

@@ -14,19 +14,20 @@ icon: material/dns
 | DNS Provider | Privacy Policy | Type | Protocols | Logging | ECS | Filtering |
 | ------------ | -------------- | ---- | --------- | ------- | --- | --------- |
 | [**AdGuard**](https://adguard.com/en/adguard-dns/overview.html) | [:octicons-link-external-24:](https://adguard.com/en/privacy/dns.html) | Commercial | Cleartext <br> DoH <br> DoT <br> DNSCrypt | Some[^1] | No | Based on server choice. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/AdguardTeam/AdGuardDNS)
-| [**Cloudflare**](https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/) | [:octicons-link-external-24:](https://www.cloudflare.com/privacypolicy) | Commercial | Cleartext <br> DoH <br> DoT | Some[^2] | No | Based on server choice.|
+| [**Cloudflare**](https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/) | [:octicons-link-external-24:](https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/) | Commercial | Cleartext <br> DoH <br> DoT | Some[^2] | No | Based on server choice.|
 | [**ControlID**](https://controld.com) | [:octicons-link-external-24:](https://controld.com/privacy) | Commercial | Cleartext <br> DoH <br> DoT | Optional[^3] | No |  Based on server choice.  |
-| [**MullvadDNS**](https://mullvad.net/en/help/dns-over-https-and-dns-over-tls) | [:octicons-link-external-24:](https://mullvad.net/en/help/privacy-policy/) [^4] | Commercial | DoH <br> DoT | No | No | Based on server choice. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/mullvad/dns-adblock)
+| [**MullvadDNS**](https://mullvad.net/en/help/dns-over-https-and-dns-over-tls) | [:octicons-link-external-24:](https://mullvad.net/en/help/no-logging-data-policy/) | Commercial | DoH <br> DoT | No[^4] | No | Based on server choice. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/mullvad/dns-adblock)
 | [**NextDNS**](https://www.nextdns.io) | [:octicons-link-external-24:](https://www.nextdns.io/privacy) | Commercial | Cleartext <br> DoH <br> DoT <br> DNSCrypt | Optional[^5] | Optional | Based on server choice. |
-| [**Quad9**](https://quad9.net) | [:octicons-link-external-24:](https://quad9.net/service/privacy) | Non-Profit | Cleartext <br> DoH <br> DoT <br> DNSCrypt | No | Optional |  Based on server choice, Malware blocking by default. |
+| [**Quad9**](https://quad9.net) | [:octicons-link-external-24:](https://quad9.net/privacy/policy/) | Non-Profit | Cleartext <br> DoH <br> DoT <br> DNSCrypt | Some[^6] | Optional |  Based on server choice, Malware blocking by default. |
 
-[^1]: We store aggregated performance metrics of our DNS server, namely the number of complete requests to a particular server, the number of blocked requests, the speed of processing requests. We keep and store the database of domains requested in the last 24 hours. We need this information to identify and block new trackers and threats. We also log how many times this or that tracker has been blocked. We need this information to remove outdated rules from our filters.
-[^2]: Cloudflare collects and stores only the limited DNS query data that is sent to the 1.1.1.1 resolver. The 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is only stored for 25 hours.
-[^3]: Neither free nor premium service have logging enabled by default. Premium users can enable logging/analytics at will.
-[^4]: Our public DNS service offers DNS over HTTPS (DoH) and DNS over TLS (DoT), with QNAME minimization and basic ad blocking. It has been audited by the security experts at Assured. You can use this privacy-enhancing service even if you don't use Mullvad.
-[^5]: NextDNS can provide insights and logging features on an opt-in basis. Users can choose retention times and log storage locations for any logs they choose to keep.
+[^1]: AdGuard stores aggregated performance metrics of their DNS servers, namely the number of complete requests to a particular server, the number of blocked requests, and the speed of processing requests. They also keep and store the database of domains requested in within last 24 hours. "We need this information to identify and block new trackers and threats." "We also log how many times this or that tracker has been blocked. We need this information to remove outdated rules from our filters." [https://adguard.com/en/privacy/dns.html](https://adguard.com/en/privacy/dns.html)
+[^2]: Cloudflare collects and stores only the limited DNS query data that is sent to the 1.1.1.1 resolver. The 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is stored only for 25 hours. [https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/](https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/)
+[^3]: Neither free nor premium users of ControlD have logging enabled by default. Premium users can enable logging/analytics at will. [https://controld.com/privacy](https://controld.com/privacy)
+[^4]: Mullvad's DNS service is available to both subscribers and non-subscribers of Mullvad VPN. Their privacy policy explicitly claims they do not log DNS requests in any way. [https://mullvad.net/en/help/no-logging-data-policy/](https://mullvad.net/en/help/no-logging-data-policy/)
+[^5]: NextDNS can provide insights and logging features on an opt-in basis. Users can choose retention times and log storage locations for any logs they choose to keep. If not specifically requested by the user, no data is logged. [https://nextdns.io/privacy](https://nextdns.io/privacy)
+[^6]: Quad9 collects some data for the purposes of threat monitoring and response. That data may then be remixed and shared, such as for the purpose of security research. Quad9 does not collect or record IP addresses or other data they deem personally identifiable. [https://www.quad9.net/privacy/policy/](https://www.quad9.net/privacy/policy/)
 
-The criteria for servers for this table are:
+The criteria for the servers listed above are:
 
 - Must support [DNSSEC](technology/dns.md#what-is-dnssec-and-when-is-it-used)
 - Must have [anycast](https://en.wikipedia.org/wiki/Anycast#Addressing_methods) support

docs/email-clients.en.md

@@ -1,5 +1,5 @@
 ---
-title: Email Clients
+title: "Email Clients"
 icon: material/email-open
 ---
 Our recommendation list contains email clients that support both [OpenPGP](/encryption/#openpgp) and strong authentication such as [Open Authorization (OAuth)](https://en.wikipedia.org/wiki/OAuth). OAuth allows you to use [Multi-Factor Authentication](/multi-factor-authentication) and prevent account theft.
@@ -7,7 +7,7 @@ Our recommendation list contains email clients that support both [OpenPGP](/encr
 ??? Attention "Email does not provide forward secrecy"
     When using end-to-end encryption (E2EE) technology like [OpenPGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy), email will still have [some metadata](/email/#email-metadata-overview) that is not encrypted in the header of the email.
 
-    OpenPGP also does not support [forward secrecy](https://en.wikipedia.org/wiki/Forward_secrecy), which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed: [How do I protect my private keys?](/email/#email-encryption-overview). Consider using a medium that forward secrecy:
+    OpenPGP also does not support [forward secrecy](https://en.wikipedia.org/wiki/Forward_secrecy), which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed: [How do I protect my private keys?](/email/#email-encryption-overview). Consider using a medium that provides forward secrecy:
 
     [Real-time Communication](/real-time-communication){ .md-button .md-button--primary }
 

docs/email.en.md

@@ -1,5 +1,5 @@
 ---
-title: Private Email Providers
+title: "Private Email Providers"
 icon: material/email
 ---
 

docs/encryption.en.md

@@ -1,5 +1,5 @@
 ---
-title: Encryption Software
+title: "Encryption Software"
 icon: material/file-lock
 ---
 Encryption of data is the only way to control who can access it. If you are currently not using encryption software for your hard disk, emails, or files, you should pick an option here.

docs/file-sharing.en.md

@@ -1,5 +1,5 @@
 ---
-title: File Sharing and Sync
+title: "File Sharing and Sync"
 icon: material/share-variant
 ---
 Discover how to privately share your files between your devices, with your friends and family, or anonymously online.

docs/index.en.md

@@ -1,5 +1,5 @@
 ---
-template: overrides/home.html
+template: overrides/home.en.html
 hide:
   - navigation
   - toc

docs/linux-desktop.en.md

@@ -1,5 +1,5 @@
 ---
-title: Linux
+title: "Linux"
 icon: fontawesome/brands/linux
 ---
 Linux distributions are commonly recommended for privacy protection and user freedom. Below are some suggestions with some general privacy and security improvements.

docs/metadata-removal-tools.en.md

@@ -1,5 +1,5 @@
 ---
-title: Metadata Removal Tools
+title: "Metadata Removal Tools"
 icon: material/tag-remove
 ---
 When sharing files, be sure to remove associated metadata. Image files commonly include [EXIF](https://en.wikipedia.org/wiki/Exif) data. Photos sometimes even include [GPS](https://en.wikipedia.org/wiki/Global_Positioning_System) coordinates in the file metadata.

docs/multi-factor-authentication.en.md

@@ -1,5 +1,5 @@
 ---
-title: Multi-Factor Authenticator Recommendations
+title: "Multi-Factor Authenticators"
 icon: 'material/two-factor-authentication'
 ---
 ## Hardware Security Keys

docs/news-aggregators.en.md

@@ -1,5 +1,5 @@
 ---
-title: News Aggregators
+title: "News Aggregators"
 icon: octicons/rss-24
 ---
 

docs/notebooks.en.md

@@ -1,5 +1,5 @@
 ---
-title: Notebooks
+title: "Notebooks"
 icon: material/notebook-edit-outline
 ---
 

docs/passwords.en.md

@@ -1,5 +1,5 @@
 ---
-title: Password Managers
+title: "Password Managers"
 icon: material/form-textbox-password
 ---
 Stay safe and secure online with an encrypted and open-source password manager.

docs/productivity.en.md

@@ -1,5 +1,5 @@
 ---
-title: Productivity Tools
+title: "Productivity Tools"
 icon: material/file-sign
 ---
 Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider.

docs/qubes.en.md

@@ -1,5 +1,5 @@
 ---
-title: Qubes OS
+title: "Qubes OS"
 icon: pg/qubes-os
 ---
 Qubes OS is a distribution of Linux that uses [Xen](https://en.wikipedia.org/wiki/Xen) to provide app isolation.

docs/real-time-communication.en.md

@@ -1,5 +1,5 @@
 ---
-title: Real-Time Communication Tools
+title: "Real-Time Communication"
 icon: material/chat-processing
 ---
 ## Encrypted Instant Messengers

docs/router.en.md

@@ -1,5 +1,5 @@
 ---
-title: Router Firmware
+title: "Router Firmware"
 icon: material/router-wireless
 ---
 Below are a few alternative operating systems, that can be used on routers, Wi-Fi access points etc.

docs/search-engines.en.md

@@ -1,5 +1,5 @@
 ---
-title: Search Engines
+title: "Search Engines"
 icon: material/search-web
 ---
 Use a search engine that doesn't build an advertising profile based on your searches.
@@ -62,10 +62,13 @@ Startpage's majority shareholder is System1 who is an adtech company. We don't t
 
     ![Searx logo](/assets/img/search-engines/searx.svg){ align=right }
 
-    **Searx** is an [open-source](https://github.com/asciimoo/searx), self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a [list of public instances](https://searx.space/).
+    **Searx** is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a [list of public instances](https://searx.space/).
 
     [Visit searx.me](https://searx.me){ .md-button .md-button--primary } [:pg-tor:](http://searxspbitokayvkhzhsnljde7rqmn7rvoga6e4waeub3h7ug3nghoad.onion){ .md-button }
 
+    **Downloads**
+    - [:fontawesome-brands-github: Source](https://github.com/asciimoo/searx)
+
 Searx is a proxy between the user and the search engines it aggregates from. Your search queries will still be sent to the search engines that Searx gets its results from.
 
 When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting Searx, as other people looking up illegal content on your instance could draw unwanted attention from authorities.

docs/security/multi-factor-authentication.en.md

@@ -1,6 +1,5 @@
 ---
-title: Multi-factor Authentication
-description: "Using strong MFA can stop over 99% of unauthorized account accesses, and it's easy to set up on the services you already use."
+title: "Multi-factor Authentication"
 icon: 'material/two-factor-authentication'
 ---
 **Multi-factor authentication** (MFA, or 2FA) is a security mechanism that requires additional steps beyond entering your username (or email) and password. The most common method are time limited codes you might receive from an SMS or app.

docs/self-contained-networks.en.md

@@ -1,5 +1,5 @@
 ---
-title: Self-Contained Networks
+title: "Self-Contained Networks"
 icon: material/security-network
 ---
 If you are currently browsing clearnet and want to access the dark web, this section is for you.

docs/setup/integrating-metadata-removal.en.md

@@ -1,6 +1,5 @@
 ---
-title: Integrating Metadata Removal
-description: "Guides for integrating metadata removal solutions in a native fashion."
+title: "Integrating Metadata Removal"
 icon: 'material/data-matrix-remove'
 ---
 

docs/social-networks.md

@@ -1,99 +0,0 @@
----
-title: Social Networks
-icon: material/account-supervisor-circle-outline
----
-Find a social network that doesn’t pry into your data or monetize your profile.
-
-## Decentralized Social Networks
-
-### Mastodon (Twitter Alternative)
-
-!!! recommendation
-
-    ![Mastodon logo](/assets/img/social-networks/mastodon.svg){ align=right }
-
-    Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like email, users can exist on different servers or even different platforms but still communicate with each other. It also has the most users, and the most diverse (in terms of interests) users, it looks good, and it is easy to setup yourself.
-
-    [Visit joinmastodon.org](https://joinmastodon.org){ .md-button .md-button--primary } [Privacy Policy](https://joinmastodon.org/privacy-policy){ .md-button }
-
-    **Downloads**
-    - [:fontawesome-brands-app-store-ios: App Store](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974)
-    - [:fontawesome-regular-circle-down: All other apps](https://joinmastodon.org/apps)
-    - [:fontawesome-brands-github: Source](https://github.com/mastodon)
-
-### diaspora\* (Google+ Alternative)
-
-!!! recommendation
-
-    ![diaspora* logo](/assets/img/social-networks/diaspora.svg){ align=right }
-
-    diaspora\* is based on three key philosophies: Decentralization, Freedom, and Privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or "pod") to host content. Pods can then interact to share status updates, photographs, and other social data.
-
-    [Visit diasporafoundation.org](https://diasporafoundation.org){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-regular-circle-down: All apps](https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora)
-    - [:fontawesome-brands-github: Source](https://github.com/diaspora)
-
-### Friendica (Facebook Alternative)
-
-!!! recommendation
-
-    ![Frendica logo](/assets/img/social-networks/friendica.svg){ align=right }
-
-    **Friendica** has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams.
-
-    [Visit friendi.ca](https://friendi.ca){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-regular-circle-down: All apps](https://friendi.ca/resources/mobile-clients/)
-    - [:fontawesome-brands-github: Source](https://github.com/friendica)
-
-### PixelFed (Instagram Alternative)
-
-!!! recommendation
-
-    ![PixelFed logo](/assets/img/social-networks/pixelfed.svg){ align=right }
-
-    **PixelFed** is a free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or join an [existing one](https://fediverse.party/en/pixelfed).
-
-    [Visit pixelfed.org](https://pixelfed.org){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-brands-github: Source](https://github.com/pixelfed)
-
-### Pleroma (Twitter Alternative)
-
-!!! recommendation
-
-    ![Pleroma logo](/assets/img/social-networks/pleroma.svg){ align=right }
-
-    **Pleroma** is a free, federated social networking server built on open protocols. It is compatible with Mastodon and many other ActivityPub and OStatus implementations.
-
-    [Visit pleroma.social](https://pleroma.social){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-regular-circle-down: All apps](https://docs-develop.pleroma.social/backend/clients/)
-    - [:fontawesome-brands-gitlab: Source](https://git.pleroma.social/pleroma)
-
-### Movim
-
-!!! recommendation
-
-    ![Movim logo](/assets/img/social-networks/movim.svg){ align=right }
-
-    **Movim** is a federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.
-
-    **Downloads**
-    - [:fontawesome-brands-github: Source](https://github.com/movim)
-
-## Related Information
-
-- [JustDeleteMe](https://justdeleteme.xyz) - A directory of direct links to delete your account from web services.
-- [Forget](https://forget.codl.fr) - A service that automatically deletes your old posts on Twitter and Mastodon that everyone has forgotten about.
-
-## Facebook Related
-
-- [How do I permanently delete my Facebook account?](https://www.facebook.com/help/224562897555674)
-- [Facebook Container by Mozilla](https://addons.mozilla.org/firefox/addon/facebook-container)
-- [Stop using Facebook](https://web.archive.org/web/20190510075433/https://www.stopusingfacebook.co/) - A curated list of reasons to stop using Facebook and how to do it.

docs/social-news-aggregator.md

@@ -1,57 +0,0 @@
----
-title: Social News Aggregator
-icon: material/newspaper-variant-outline
----
-Stay up-to-date with privacy-respecting online bulletin boards.
-
-### Tildes
-
-!!! recommendation
-
-    ![Tildes logo](/assets/img/social-media-aggregator/tildes.svg){ align=right }
-
-    **Tildes** is a web-based self-hostable online bulletin board. It is licensed under [AGPLv3](https://gitlab.com/tildes/tildes/blob/master/LICENSE).
-
-    [Visit tildes.net](https://tildes.net){ .md-button .md-button--primary } [Privacy Policy](https://docs.tildes.net/policies/privacy-policy){ .md-button }
-
-    **Downloads**
-    - [:fontawesome-brands-gitlab: Source](hhttps://gitlab.com/tildes)
-
-### Lemmy
-
-!!! recommendation
-
-    ![Lemmy logo](/assets/img/social-media-aggregator/lemmy.svg){ align=right }
-
-    **Lemmy** is an [AGPL](https://github.com/dessalines/lemmy/blob/master/LICENSE)-licensed self-hostable link aggregator and discussion network designed to serve as an alternative to Reddit within the ActivityPub [Fediverse](https://www.wikipedia.org/wiki/Fediverse).
-
-    [Visit lemmy.ml](https://lemmy.ml){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-brands-github: Source](https://github.com/LemmyNet)
-
-### Postmill
-
-!!! recommendation
-
-    ![Postmill logo](/assets/img/social-media-aggregator/postmill.png){ align=right }
-
-    **Postmill** is a free, web-based, social link aggregator with voting and nested comments.
-
-    [Visit postmill.xyz](https://postmill.xyz){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-brands-gitlab: Source](https://gitlab.com/postmill)
-
-### Freepost
-
-!!! recommendation
-
-    ![Freepost logo](/assets/img/social-media-aggregator/freepost.svg){ align=right }
-
-    **Freepost** is a free and open-source discussion board based on free software and free culture with a highly motivated community.
-
-    [Visit freepo.st](https://freepo.st){ .md-button .md-button--primary }
-
-    **Downloads**
-    - [:fontawesome-brands-git: Source](https://notabug.org/zPlus/freepost)

docs/threat-modeling.en.md

@@ -1,6 +1,5 @@
 ---
-layout: evergreen
-title: What are threat models?
+title: "What are threat models?"
 icon: 'material/target-account'
 ---
 

docs/tools.en.md

@@ -1,5 +1,5 @@
 ---
-title: Recommended Privacy Tools
+title: "Privacy Tools"
 icon: material/tools
 hide:
   - toc
@@ -159,34 +159,6 @@ We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS
 
 [Learn more...](search-engines.md)
 
-### Social Media
-
-<div class="grid cards" markdown>
-
-- ![Mastodon logo](/assets/img/social-networks/mastodon.svg){ .twemoji } [Mastodon](https://joinmastodon.org/)
-- ![diaspora logo](/assets/img/social-networks/diaspora.svg){ .twemoji } [diaspora\*](https://diasporafoundation.org/)
-- ![Friendica logo](/assets/img/social-networks/friendica.svg){ .twemoji } [Friendica](https://friendi.ca/)
-- ![PixelFed logo](/assets/img/social-networks/pixelfed.svg){ .twemoji } [PixelFed](https://pixelfed.org/)
-- ![Pleroma logo](/assets/img/social-networks/pleroma.svg){ .twemoji } [Pleroma](https://pleroma.social/)
-- ![Movim logo](/assets/img/social-networks/movim.svg){ .twemoji } [Movim](https://github.com/movim)
-
-</div>
-
-[Learn more...](social-networks.md)
-
-**News Aggregators:**
-
-<div class="grid cards" markdown>
-
-- ![Tildes logo](/assets/img/social-media-aggregator/tildes.svg){ .twemoji } [Tildes](https://tildes.net/)
-- ![Lemmy logo](/assets/img/social-media-aggregator/lemmy.svg){ .twemoji } [Lemmy](https://lemmy.ml/)
-- ![Postmill logo](/assets/img/social-media-aggregator/postmill.png){ .twemoji } [Postmill](https://postmill.xyz/)
-- ![Freepost logo](/assets/img/social-media-aggregator/freepost.svg){ .twemoji } [Freepost](https://freepo.st/)
-
-</div>
-
-[Learn more...](social-news-aggregator.md)
-
 ### VPN Providers
 
 ??? danger "VPNs do not provide anonymity"
@@ -370,6 +342,8 @@ We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS
 
 </div>
 
+[Learn more...](real-time-communication.md)
+
 ### News Aggregators
 
 <div class="grid cards" markdown>
@@ -384,7 +358,7 @@ We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS
 
 </div>
 
-[Learn more...](real-time-communication.md)
+[Learn more...](news-aggregators.md)
 
 ### Self-Contained Networks
 

docs/video-streaming.en.md

@@ -1,5 +1,5 @@
 ---
-title: Video Streaming
+title: "Video Streaming"
 icon: material/video-wireless
 ---
 The primary threat when using a video streaming platform is that your streaming habits and subscription lists could be used to profile you. You should combine these tools with a [VPN](/vpn) or [Tor](https://www.torproject.org/) to make it harder to profile your usage.
@@ -10,7 +10,7 @@ The primary threat when using a video streaming platform is that your streaming
 
 !!! Warning
 
-    When using Freetube, your IP address is still known to YouTube, [Invidious](https://instances.invidious.io) and the SponsorBlock instances that you use. Consider using a [VPN](/vpn) or [Tor](https://www.torproject.org) if your [threat model](/threat-modeling.md) requires hiding your IP address.
+    When using Freetube, your IP address is still known to YouTube, [Invidious](https://instances.invidious.io) and the SponsorBlock instances that you use. Consider using a [VPN](/vpn) or [Tor](https://www.torproject.org) if your [threat model](threat-modeling.md) requires hiding your IP address.
 
 !!! recommendation
 

docs/vpn.en.md

@@ -1,5 +1,5 @@
 ---
-title: VPN Services
+title: "VPN Services"
 icon: material/vpn
 ---
 

mkdocs.production.yml

@@ -1,10 +0,0 @@
-INHERIT: mkdocs.yml
-site_url: "https://www.privacyguides.org/"
-watch:
-  - theme
-  - mkdocs.yml
-plugins:
-  - search
-  - privacy:
-      externals_exclude:
-        - cdn.jsdelivr.net/npm/mathjax@3/* 

mkdocs.yml

@@ -1,3 +1,7 @@
+docs_dir: 'docs'
+site_url: "https://www.privacyguides.org/"
+site_dir: 'site'
+
 site_name: Privacy Guides
 site_description: |
   Massive organizations are monitoring your online activities. Privacy Guides is your central privacy and security resource to protect yourself online.
@@ -5,6 +9,7 @@ copyright: |
   <b>Privacy Guides</b> is a non-profit, socially motivated website that provides information for protecting your data security and privacy.<br>
   We do not make money from recommending certain products, and we do not utilize affiliate links.<br>
   This content was made available by the Privacy Guides team and contributors. <a href="https://github.com/privacyguides/privacyguides">Get involved</a>!
+
 extra:
   generator: false
   social:
@@ -20,54 +25,6 @@ repo_url: https://github.com/privacyguides/privacyguides.org
 repo_name: privacyguides.org
 edit_uri: edit/main/docs/
 
-nav:
-  - Home: 'index.md'
-  - 'Privacy Introduction':
-    - 'Threat Modeling': 'threat-modeling.md'
-    - 'Technology Basics':
-      - 'DNS': 'technology/dns.md'
-    - 'Security Basics':
-      - 'Multi-Factor Authentication': 'security/multi-factor-authentication.md'
-    - 'Setup Guides':
-      - 'Integrating Metadata Removal': 'setup/integrating-metadata-removal.md'
-  - 'Recommendations':
-    - 'Privacy Tools': 'tools.md'
-    - 'Browsers':
-      - 'Web Browsers': 'browsers.md'
-    - 'Operating Systems':
-      - 'Android': 'android.md'
-      - 'Linux Desktop': 'linux-desktop.md'
-      - 'Qubes OS': 'qubes.md'
-      - 'Router Firmware': 'router.md'
-    - 'Providers':
-      - 'Cloud Storage': 'cloud.md'
-      - 'DNS Servers': 'dns.md'
-      - 'Email Providers': 'email.md'
-      - 'Search Engines': 'search-engines.md'
-      - 'Social Networks': 'social-networks.md'
-      - 'Social News Aggregators': 'social-news-aggregator.md'
-      - 'VPN Providers': 'vpn.md'
-    - 'Software':
-      - 'Calendar/Contacts Sync': 'calendar-contacts.md'
-      - 'Digital Notebooks': 'notebooks.md'
-      - 'Email Clients': 'email-clients.md'
-      - 'Encryption Tools': 'encryption.md'
-      - 'File Sharing/Sync': 'file-sharing.md'
-      - 'Metadata Removal Tools': 'metadata-removal-tools.md'
-      - 'Multi-Factor Authenticators': 'multi-factor-authentication.md'
-      - 'Password Managers': 'passwords.md'
-      - 'Productivity Tools': 'productivity.md'
-      - 'Real-Time Communication': 'real-time-communication.md'
-      - 'News Aggregators': 'news-aggregators.md'
-      - 'Self-Contained Networks': 'self-contained-networks.md'
-      - 'Video Streaming': 'video-streaming.md'
-  - 'About Us':
-    - 'Privacy Guides': 'about.md'
-    - 'Notices': 'about/notices.md'
-    - 'Privacy Policy': 'about/privacy-policy.md'
-  - 'Discussions': 'https://github.com/orgs/privacyguides/discussions'
-  - 'Blog': 'https://blog.privacyguides.org/'
-
 theme:
   name: material
   custom_dir: theme
@@ -97,7 +54,18 @@ watch:
   - theme
 
 plugins:
+  - i18n:
+      default_language: en
+      material_alternate: true
+      languages:
+        en:
+          name: English
+          build: false
   - tags
+  - search
+  - privacy:
+      externals_exclude:
+        - cdn.jsdelivr.net/npm/mathjax@3/* 
 extra_css:
   - stylesheets/extra.css
 markdown_extensions:
@@ -131,3 +99,49 @@ markdown_extensions:
 
 extra_javascript:
   - javascripts/mathjax.js
+
+nav:
+  - Home: 'index.md'
+  - 'Privacy Introduction':
+    - 'threat-modeling.md'
+    - 'Technology Basics':
+      - 'technology/dns.md'
+    - 'Security Basics':
+      - 'security/multi-factor-authentication.md'
+    - 'Setup Guides':
+      - 'setup/integrating-metadata-removal.md'
+  - 'Recommendations':
+    - 'tools.md'
+    - 'Browsers':
+      - 'browsers.md'
+    - 'Operating Systems':
+      - 'android.md'
+      - 'linux-desktop.md'
+      - 'qubes.md'
+      - 'router.md'
+    - 'Providers':
+      - 'cloud.md'
+      - 'dns.md'
+      - 'email.md'
+      - 'search-engines.md'
+      - 'vpn.md'
+    - 'Software':
+      - 'calendar-contacts.md'
+      - 'notebooks.md'
+      - 'email-clients.md'
+      - 'encryption.md'
+      - 'file-sharing.md'
+      - 'metadata-removal-tools.md'
+      - 'multi-factor-authentication.md'
+      - 'passwords.md'
+      - 'productivity.md'
+      - 'real-time-communication.md'
+      - 'news-aggregators.md'
+      - 'self-contained-networks.md'
+      - 'video-streaming.md'
+  - 'About Us':
+    - 'about.md'
+    - 'about/notices.md'
+    - 'about/privacy-policy.md'
+  - 'Discussions': 'https://github.com/orgs/privacyguides/discussions'
+  - 'Blog': 'https://blog.privacyguides.org/'

theme/overrides/home.en.html

@@ -10,8 +10,8 @@
       <div class="mdx-hero">
         <div class="mdx-hero__content">
           <h1>The guide to restoring your online privacy.</h1>
-          <p>{{ config.site_description }}</p>
-          <a href="{{ 'tools/' | url }}" title="Recommended privacy tools, services, and knowledge" class="md-button md-button--primary">
+          <p>Massive organizations are monitoring your online activities. Privacy Guides is your central privacy and security resource to protect yourself online.</p>
+          <a href="tools/" title="Recommended privacy tools, services, and knowledge" class="md-button md-button--primary">
             Recommended Tools
           </a>
           <a href="https://blog.privacyguides.org/" title="Blog posts from Privacy Guides contributors" class="md-button">