Revert some changes from cc69609 (#2073)

config/mkdocs.en.yml

@@ -67,6 +67,11 @@ plugins:
     cards_font: Public Sans
     cache_dir: .cache/plugin/social-en
 
+markdown_extensions:
+  pymdownx.snippets:
+    auto_append: 
+      - includes/abbreviations.en.txt
+
 nav:
   - Home: 'index.md'
   - Knowledge Base:

config/mkdocs.fr.yml

@@ -67,6 +67,11 @@ plugins:
     cards_font: Public Sans
     cache_dir: .cache/plugin/social-fr
 
+markdown_extensions:
+  pymdownx.snippets:
+    auto_append: 
+      - includes/abbreviations.fr.txt
+
 nav:
   - Accueil: 'index.md'
   - Base de connaissances:

config/mkdocs.he.yml

@@ -71,6 +71,11 @@ plugins:
     cards_font: Suez One
     cache_dir: .cache/plugin/social-he
 
+markdown_extensions:
+  pymdownx.snippets:
+    auto_append: 
+      - includes/abbreviations.he.txt
+
 nav:
   - "דף הבית": 'index.md'
   - "ידע בסיסי":

config/mkdocs.nl.yml

@@ -67,6 +67,11 @@ plugins:
     cards_font: Public Sans
     cache_dir: .cache/plugin/social-nl
 
+markdown_extensions:
+  pymdownx.snippets:
+    auto_append: 
+      - includes/abbreviations.nl.txt
+
 nav:
   - Home: 'index.md'
   - Kennisbank:

docs/404.md

@@ -16,5 +16,3 @@ We couldn't find the page you were looking for! Maybe you were looking for one o
 - [Best VPN Providers](vpn.md)
 - [Privacy Guides Forum](https://discuss.privacyguides.net)
 - [Our Blog](https://blog.privacyguides.org)
-
---8<-- "includes/abbreviations.en.txt"

docs/about/criteria.md

@@ -38,5 +38,3 @@ We have these requirements in regard to developers which wish to submit their pr
 
 - Must state what the exact threat model is with their project.
     - It should be clear to potential users what the project can provide, and what it cannot.
-
---8<-- "includes/abbreviations.en.txt"

docs/about/donate.md

@@ -43,5 +43,3 @@ Privacy Guides is a **non-profit** organization. We use donations for a variety
 :   We occasionally purchase products and services for the purposes of testing our [recommended tools](../tools.md).
 
 We are still working with our fiscal host (the Open Collective Foundation) to receive cryptocurrency donations, at the moment the accounting is unfeasible for many smaller transactions, but this should change in the future. In the meantime, if you wish to make a sizable (> $100) cryptocurrency donation, please reach out to [[email protected]](mailto:[email protected]).
-
---8<-- "includes/abbreviations.en.txt"

docs/about/index.md

@@ -86,5 +86,3 @@ Our team members review all changes made to the website and handle administrativ
 :fontawesome-brands-creative-commons: :fontawesome-brands-creative-commons-by: :fontawesome-brands-creative-commons-nd: Unless otherwise noted, the original content on this website is made available under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). This means that you are free to copy and redistribute the material in any medium or format for any purpose, even commercially; as long as you give appropriate credit to `Privacy Guides (www.privacyguides.org)` and provide a link to the license. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. If you remix, transform, or build upon the content of this website, you may not distribute the modified material.
 
 This license is in place to prevent people from sharing our work without giving proper credit, and to prevent people from modifying our work in a way that could be used to mislead people. If you find the terms of this license too restrictive for the project you're working on, please reach out to us at `[email protected]`. We are happy to provide alternative licensing options for well-intentioned projects in the privacy space!
-
---8<-- "includes/abbreviations.en.txt"

docs/about/notices.md

@@ -41,5 +41,3 @@ You must not conduct any systematic or automated data collection activities on o
 * Scraping
 * Data Mining
 * 'Framing' (IFrames)
-
---8<-- "includes/abbreviations.en.txt"

docs/about/privacy-policy.md

@@ -59,5 +59,3 @@ In France it's the Commission Nationale de l'Informatique et des Libertés which
 We will post any new versions of this statement [here](privacy-policy.md). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to the [Privacy Policy](privacy-policy.md) for the latest contact information at any time.
 
 A full revision [history](https://github.com/privacyguides/privacyguides.org/commits/main/docs/about/privacy-policy.md) of this page can be found on GitHub.
-
---8<-- "includes/abbreviations.en.txt"

docs/about/privacytools.md

@@ -115,5 +115,3 @@ This topic has been discussed extensively within our communities in various loca
 - [Apr 2, 2022 response by u/dng99 to PrivacyTools' accusatory blog post](https://www.reddit.com/comments/tuo7mm/comment/i35kw5a/)
 - [May 16, 2022 response by @TommyTran732 on Twitter](https://twitter.com/TommyTran732/status/1526153497984618496)
 - [Sep 3, 2022 post on Techlore's forum by @dngray](https://discuss.techlore.tech/t/has-anyone-seen-this-video-wondering-your-thoughts/792/20)
-
---8<-- "includes/abbreviations.en.txt"

docs/about/services.md

@@ -36,5 +36,3 @@ Access may be granted upon request to Privacy Guides team members, Matrix modera
 - Availability: Semi-Public  
 We host Invidious primarily to serve embedded YouTube videos on our website, this instance is not intended for general-purpose use and may be limited at any time.
 - Source: [github.com/iv-org/invidious](https://github.com/iv-org/invidious)
-
---8<-- "includes/abbreviations.en.txt"

docs/about/statistics.md

@@ -58,5 +58,3 @@ title: Traffic Statistics
         })
     })
 </script>
-
---8<-- "includes/abbreviations.en.txt"

docs/advanced/communication-network-types.md

@@ -100,5 +100,3 @@ Self-hosting a node in an anonymous routing network does not provide the hoster
 - Less reliable if nodes are selected by randomized routing, some nodes may be very far from the sender and receiver, adding latency or even failing to transmit messages if one of the nodes goes offline.
 - More complex to get started, as the creation and secured backup of a cryptographic private key is required.
 - Just like other decentralized platforms, adding features is more complex for developers than on a centralized platform. Hence, features may be lacking or incompletely implemented, such as offline message relaying or message deletion.
-
---8<-- "includes/abbreviations.en.txt"

docs/advanced/dns-overview.md

@@ -304,5 +304,3 @@ The [EDNS Client Subnet](https://en.wikipedia.org/wiki/EDNS_Client_Subnet) is a
 It's intended to "speed up" delivery of data by giving the client an answer that belongs to a server that is close to them such as a [content delivery network](https://en.wikipedia.org/wiki/Content_delivery_network), which are often used in video streaming and serving JavaScript web apps.
 
 This feature does come at a privacy cost, as it tells the DNS server some information about the client's location.
-
---8<-- "includes/abbreviations.en.txt"

docs/advanced/tor-overview.md

@@ -77,5 +77,3 @@ If you wish to use Tor for browsing the web, we only recommend the **official**
 - [Tor Browser User Manual](https://tb-manual.torproject.org)
 - [How Tor Works - Computerphile](https://invidious.privacyguides.net/embed/QRYzre4bf7I?local=true) <small>(YouTube)</small>
 - [Tor Onion Services - Computerphile](https://invidious.privacyguides.net/embed/lVcbq_a5N9I?local=true) <small>(YouTube)</small>
-
---8<-- "includes/abbreviations.en.txt"

docs/android.md

@@ -351,5 +351,3 @@ That said, the [F-Droid](https://f-droid.org/en/packages/) and [IzzyOnDroid](htt
 - Applications on this page must not be applicable to any other software category on the site.
 - General applications should extend or replace core system functionality.
 - Applications should receive regular updates and maintenance.
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/account-creation.md

@@ -78,5 +78,3 @@ In many cases you will need to provide a number that you can receive SMS or call
 ### Username and password
 
 Some services allow you to register without using an email address and only require you to set a username and password. These services may provide increased anonymity when combined with a VPN or Tor. Keep in mind that for these accounts there will most likely be **no way to recover your account** in the event you forget your username or password.
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/account-deletion.md

@@ -59,5 +59,3 @@ Even when you are able to delete an account, there is no guarantee that all your
 ## Avoid New Accounts
 
 As the old saying goes, "an ounce of prevention is worth a pound of cure." Whenever you feel tempted to sign up for a new account, ask yourself, "Do I really need this? Can I accomplish what I need to without an account?" It can often be much harder to delete an account than to create one. And even after deleting or changing the info on your account, there might be a cached version from a third-party—like the [Internet Archive](https://archive.org/). Avoid the temptation when you're able to—your future self will thank you!
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/common-misconceptions.md

@@ -57,5 +57,3 @@ One of the clearest threat models is one where people *know who you are* and one
     Using Tor can help with this. It is also worth noting that greater anonymity is possible through asynchronous communication: Real-time communication is vulnerable to analysis of typing patterns (i.e. more than a paragraph of text, distributed on a forum, via email, etc.)
 
 [^1]: One notable example of this is the [2021 incident in which University of Minnesota researchers introduced three vulnerabilities into the Linux kernel development project](https://cse.umn.edu/cs/linux-incident).
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/common-threats.md

@@ -145,5 +145,3 @@ You must always consider the risks of trying to bypass censorship, the potential
 [^3]: Wikipedia: [*Surveillance capitalism*](https://en.wikipedia.org/wiki/Surveillance_capitalism)
 [^4]: "[Enumerating badness](https://www.ranum.com/security/computer_security/editorials/dumb/)" (or, "listing all the bad things that we know about"), as many adblockers and antivirus programs do, fails to adequately protect you from new and unknown threats because they have not yet been added to the filter list. You should also employ other mitigation techniques.
 [^5]: United Nations: [*Universal Declaration of Human Rights*](https://www.un.org/en/about-us/universal-declaration-of-human-rights).
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/email-security.md

@@ -38,5 +38,3 @@ Email metadata is protected from outside observers with [Opportunistic TLS](http
 ### Why Can't Metadata be E2EE?
 
 Email metadata is crucial to the most basic functionality of email (where it came from, and where it has to go). E2EE was not built into the email protocols originally, instead requiring add-on software like OpenPGP. Because OpenPGP messages still have to work with traditional email providers, it cannot encrypt email metadata, only the message body itself. That means that even when using OpenPGP, outside observers can see lots of information about your messages, such as who you're emailing, the subject lines, when you're emailing, etc.
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/multi-factor-authentication.md

@@ -161,5 +161,3 @@ SSH MFA can also be set up using TOTP. DigitalOcean has provided a tutorial [How
 ### KeePass (and KeePassXC)
 
 KeePass and KeePassXC databases can be secured using Challenge-Response or HOTP as a second-factor authentication. Yubico has provided a document for KeePass [Using Your YubiKey with KeePass](https://support.yubico.com/hc/en-us/articles/360013779759-Using-Your-YubiKey-with-KeePass) and there is also one on the [KeePassXC](https://keepassxc.org/docs/#faq-yubikey-2fa) website.
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/passwords-overview.md

@@ -108,5 +108,3 @@ There are many good options to choose from, both cloud-based and local. Choose o
 ### Backups
 
 You should store an [encrypted](../encryption.md) backup of your passwords on multiple storage devices or a cloud storage provider. This can help you access your passwords if something happens to your primary device or the service you are using.
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/threat-modeling.md

@@ -102,5 +102,3 @@ For people looking to increase their privacy and security online, we've compiled
 ## Sources
 
 - [EFF Surveillance Self Defense: Your Security Plan](https://ssd.eff.org/en/module/your-security-plan)
-
---8<-- "includes/abbreviations.en.txt"

docs/basics/vpn-overview.md

@@ -74,5 +74,3 @@ For situations like these, or if you have another compelling reason, the VPN pro
 - [Free VPN App Investigation](https://www.top10vpn.com/free-vpn-app-investigation/)
 - [Hidden VPN owners unveiled: 101 VPN products run by just 23 companies](https://vpnpro.com/blog/hidden-vpn-owners-unveiled-97-vpns-23-companies/)
 - [This Chinese company is secretly behind 24 popular apps seeking dangerous permissions](https://vpnpro.com/blog/chinese-company-secretly-behind-popular-apps-seeking-dangerous-permissions/)
-
---8<-- "includes/abbreviations.en.txt"

docs/calendar.md

@@ -66,5 +66,3 @@ Calendars contain some of your most sensitive data; use products that implement
 Our best-case criteria represents what we would like to see from the perfect project in this category. Our recommendations may not include any or all of this functionality, but those which do may rank higher than others on this page.
 
 - Should integrate with native OS calendar and contact management apps if applicable.
-
---8<-- "includes/abbreviations.en.txt"

docs/cloud.md

@@ -57,5 +57,3 @@ Our best-case criteria represents what we would like to see from the perfect pro
     - These clients should integrate with native OS tools for cloud storage providers, such as Files app integration on iOS, or DocumentsProvider functionality on Android.
 - Should support easy file-sharing with other users.
 - Should offer at least basic file preview and editing functionality on the web interface.
-
---8<-- "includes/abbreviations.en.txt"

docs/data-redaction.md

@@ -141,5 +141,3 @@ The app offers multiple ways to erase metadata from images. Namely:
 
 - Apps developed for open-source operating systems must be open-source.
 - Apps must be free and should not include ads or other limitations.
-
---8<-- "includes/abbreviations.en.txt"

docs/desktop-browsers.md

@@ -258,5 +258,3 @@ Our best-case criteria represents what we would like to see from the perfect pro
 
 - Must not replicate built-in browser or OS functionality.
 - Must directly impact user privacy, i.e. must not simply provide information.
-
---8<-- "includes/abbreviations.en.txt"

docs/desktop.md

@@ -179,5 +179,3 @@ Our recommended operating systems:
 - Must support full-disk encryption during installation.
 - Must not freeze regular releases for more than 1 year. We [do not recommend](os/linux-overview.md#release-cycle) "Long Term Support" or "stable" distro releases for desktop usage.
 - Must support a wide variety of hardware.
-
---8<-- "includes/abbreviations.en.txt"

docs/dns.md

@@ -138,5 +138,3 @@ A self-hosted DNS solution is useful for providing filtering on controlled platf
     [:octicons-info-16:](https://docs.pi-hole.net/){ .card-link title=Documentation}
     [:octicons-code-16:](https://github.com/pi-hole/pi-hole){ .card-link title="Source Code" }
     [:octicons-heart-16:](https://pi-hole.net/donate){ .card-link title=Contribute }
-
---8<-- "includes/abbreviations.en.txt"

docs/email-clients.md

@@ -234,5 +234,3 @@ Our best-case criteria represents what we would like to see from the perfect pro
 - Should not collect any telemetry by default.
 - Should support OpenPGP natively, i.e. without extensions.
 - Should support storing OpenPGP encrypted emails locally.
-
---8<-- "includes/abbreviations.en.txt"

docs/email.md

@@ -483,5 +483,3 @@ Must not have any marketing which is irresponsible:
 ### Additional Functionality
 
 While not strictly requirements, there are some other convenience or privacy factors we looked into when determining which providers to recommend.
-
---8<-- "includes/abbreviations.en.txt"

docs/encryption.md

@@ -351,5 +351,3 @@ Our best-case criteria represents what we would like to see from the perfect pro
 
 - Operating System (FDE) encryption apps should utilize hardware security such as a TPM or Secure Enclave.
 - File encryption apps should have first- or third-party support for mobile platforms.
-
---8<-- "includes/abbreviations.en.txt"

docs/file-sharing.md

@@ -143,5 +143,3 @@ Our best-case criteria represents what we would like to see from the perfect pro
 
 - Has mobile clients for iOS and Android, which at least support document previews.
 - Supports photo backup from iOS and Android, and optionally supports file/folder sync on Android.
-
---8<-- "includes/abbreviations.en.txt"

docs/frontends.md

@@ -264,5 +264,3 @@ Recommended frontends...
 We only consider frontends for websites which are...
 
 - Not normally accessible without JavaScript.
-
---8<-- "includes/abbreviations.en.txt"

docs/index.md

@@ -39,5 +39,3 @@ Trying to protect all your data from everyone all the time is impractical, expen
 [:material-hand-coin-outline:](about/donate.md){ title="Support the project" }
 
 It's important for a website like Privacy Guides to always stay up-to-date. We need our audience to keep an eye on software updates for the applications listed on our site and follow recent news about providers that we recommend. It's hard to keep up with the fast pace of the internet, but we try our best. If you spot an error, think a provider should not be listed, notice a qualified provider is missing, believe a browser plugin is no longer the best choice, or uncover any other issue, please let us know.
-
---8<-- "includes/abbreviations.en.txt"

docs/kb-archive.md

@@ -13,5 +13,3 @@ Some pages that used to be in our knowledge base can now be found on our blog:
 - [Secure Data Erasure](https://blog.privacyguides.org/2022/05/25/secure-data-erasure/)
 - [Integrating Metadata Removal](https://blog.privacyguides.org/2022/04/09/integrating-metadata-removal/)
 - [iOS Configuration Guide](https://blog.privacyguides.org/2022/10/22/ios-configuration-guide/)
-
---8<-- "includes/abbreviations.en.txt"

docs/meta/brand.md

@@ -20,5 +20,3 @@ Additional branding guidelines can be found at [github.com/privacyguides/brand](
 "Privacy Guides" and the shield logo are trademarks owned by Jonah Aragon, unlimited usage is granted to the Privacy Guides project.
 
 Without waiving any of its rights, Privacy Guides does not advise others on the scope of its intellectual property rights. Privacy Guides does not permit or consent to any use of its trademarks in any manner that is likely to cause confusion by implying association with or sponsorship by Privacy Guides. If you are aware of any such use, please contact Jonah Aragon at [email protected]. Consult your legal counsel if you have questions.
-
---8<-- "includes/abbreviations.en.txt"

docs/meta/git-recommendations.md

@@ -43,5 +43,3 @@ If you are working on your own branch, run these commands before submitting a PR
 git fetch origin
 git rebase origin/main
 ```
-
---8<-- "includes/abbreviations.en.txt"

docs/meta/uploading-images.md

@@ -87,5 +87,3 @@ scour --set-precision=5 \
       --protect-ids-noninkscape \
       input.svg output.svg
 ```
-
---8<-- "includes/abbreviations.en.txt"

docs/meta/writing-style.md

@@ -85,5 +85,3 @@ Source: [plainlanguage.gov](https://www.plainlanguage.gov/guidelines/conversatio
 > - “must not” for a prohibition
 > - “may” for a discretionary action
 > - “should” for a recommendation
-
---8<-- "includes/abbreviations.en.txt"

docs/mobile-browsers.md

@@ -188,5 +188,3 @@ Additional filter lists do slow things down and may increase your attack surface
 
 - Must not replicate built-in browser or OS functionality.
 - Must directly impact user privacy, i.e. must not simply provide information.
-
---8<-- "includes/abbreviations.en.txt"

docs/multi-factor-authentication.md

@@ -139,5 +139,3 @@ We highly recommend that you use mobile TOTP apps instead of desktop alternative
 - Must not require internet connectivity.
 - Must not sync to a third-party cloud sync/backup service.
     - **Optional** E2EE sync support with OS-native tools is acceptable, e.g. encrypted sync via iCloud.
-
---8<-- "includes/abbreviations.en.txt"

docs/news-aggregators.md

@@ -169,5 +169,3 @@ You can subscribe YouTube channels without logging in and associating usage info
     ```text
     https://www.youtube.com/feeds/videos.xml?channel_id=[CHANNEL ID]
     ```
-
---8<-- "includes/abbreviations.en.txt"

docs/notebooks.md

@@ -112,5 +112,3 @@ Cryptee offers 100MB of storage for free, with paid options if you need more. Si
 
 - Local backup/sync functionality should support encryption.
 - Cloud-based platforms should support document sharing.
-
---8<-- "includes/abbreviations.en.txt"