From 8a70715c89f607fb439ab9bd945f4072f1a8b04a Mon Sep 17 00:00:00 2001
From: 0rdinant <github.ebrha@aleeas.com>
Date: Sat, 12 Mar 2022 16:16:55 +0000
Subject: [PATCH] Browser page cleanup (#698)

Signed-off-by: Daniel Gray <dng@disroot.org>
---
 _data/software/browsers-desktop/1_firefox.yml             | 6 +++---
 _data/software/browsers-mobile/1_bromite.yml              | 4 ++--
 _data/software/browsers-mobile/2_firefox.yml              | 8 ++++----
 _data/software/browsers-mobile/3_firefox_focus.yml        | 6 +++---
 _data/software/browsers-resources/1_ublock_origin.yml     | 4 +++-
 .../browsers-resources/2_terms_of_service_didnt_read.yml  | 2 +-
 _data/software/browsers/1_tor-browser.yml                 | 2 +-
 collections/_evergreen/browsers.md                        | 4 ++--
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/_data/software/browsers-desktop/1_firefox.yml b/_data/software/browsers-desktop/1_firefox.yml
index 038e0a2a..840f0a76 100644
--- a/_data/software/browsers-desktop/1_firefox.yml
+++ b/_data/software/browsers-desktop/1_firefox.yml
@@ -2,7 +2,7 @@ title: Firefox Desktop
 type: Recommendation
 logo: /assets/img/browsers/firefox.svg
 description: |
-  **Firefox** has some really strong privacy settings such as [Enhanced Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop) which can help block various [types of tracking](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop#w_what-enhanced-tracking-protection-blocks).
+  **Firefox** provides strong privacy settings such as [Enhanced Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop), which can help block various [types of tracking](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop#w_what-enhanced-tracking-protection-blocks).
 
   These options can be found in the *Privacy & Security* settings page ( ≡ → Settings → Privacy & Security).
 
@@ -23,11 +23,11 @@ description: |
   You can still stay logged into websites by allowing exceptions.
 
   #### Extensions
-  We normally do not recommend installing any extensions, as they have privileged access within your browser. We make an exception for [uBlock Origin](/browsers/#additional-resources),
+  We normally do not recommend installing any extensions as they have privileged access within your browser. We make an exception for [uBlock Origin](/browsers/#additional-resources),
   a popular content blocker and 🏆️ [Recommended Extension](https://support.mozilla.org/kb/add-on-badges#w_recommended-extensions) by Mozilla.
 
   #### Arkenfox (advanced)
-  The [Arkenfox project](https://github.com/arkenfox/user.js) provides a set of carefully considered options for Firefox. These options are quite strict but a few are subjective and can sometimes cause a website to not work properly. You can easily change these settings to suit your needs. We **strongly recommend** reading through their [wiki](https://github.com/arkenfox/user.js/wiki). Arkenfox also enables [container](https://support.mozilla.org/en-US/kb/containers#w_for-advanced-users) support.
+  The [Arkenfox project](https://github.com/arkenfox/user.js) provides a set of carefully considered options for Firefox. These options are quite strict but a few are subjective and may cause some websites to not work properly. You can easily change these settings to suit your needs. We **strongly recommend** reading through their [wiki](https://github.com/arkenfox/user.js/wiki). Arkenfox also enables [container](https://support.mozilla.org/en-US/kb/containers#w_for-advanced-users) support.
 
 website: 'https://firefox.com'
 privacy_policy: 'https://www.mozilla.org/privacy/firefox'
diff --git a/_data/software/browsers-mobile/1_bromite.yml b/_data/software/browsers-mobile/1_bromite.yml
index 3ab34cb6..d56cc644 100644
--- a/_data/software/browsers-mobile/1_bromite.yml
+++ b/_data/software/browsers-mobile/1_bromite.yml
@@ -2,9 +2,9 @@ title: Bromite
 type: Recommendation
 logo: /assets/img/browsers/bromite.svg
 description: |
-  **Bromite** is a Chromium-based browser with privacy and security enhancements, built-in ad blocking and some fingerprinting randomization.
+  **Bromite** is a [Chromium](https://en.wikipedia.org/wiki/Chromium_(web_browser))-based browser with privacy and security enhancements, built-in ad blocking, and some fingerprinting randomization.
 
-  These options can be found in *Privacy and Security* ( ⁝ → ⚙️ Settings → Privacy and Security)
+  These options can be found in *Privacy and Security* ( ⁝ → ⚙️ Settings → Privacy and Security).
 
   ##### **HTTPS-Only Mode**
   <ul style="list-style-type:none;padding-left:0;">
diff --git a/_data/software/browsers-mobile/2_firefox.yml b/_data/software/browsers-mobile/2_firefox.yml
index 3c198679..54e53b1a 100644
--- a/_data/software/browsers-mobile/2_firefox.yml
+++ b/_data/software/browsers-mobile/2_firefox.yml
@@ -1,8 +1,8 @@
-title: Firefox iOS
+title: Firefox for iOS
 type: Recommendation
 logo: /assets/img/browsers/firefox-ios.svg
 description: |
-  **Firefox** iOS includes [Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-ios) which lets you select the blocklists Cookies, Tracking Content, Cryptominers, Fingerprinters and Redirect trackers.
+  **Firefox** for iOS includes [Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-ios) which allows you to select blocklists for tracking cookies, tracking content, cryptominers, fingerprinters and redirect trackers.
 
   ##### **Tracking Protection**
   <ul style="list-style-type:none;padding-left:0;">
@@ -10,9 +10,9 @@ description: |
   </ul>
 
   ##### **Sanitizing on close**
-  Firefox iOS does not have have an option to clear cache on quit so you must do it manually. ( ≡ → ⚙️ Settings → Data Management).
+  Firefox for iOS does not have have an option to clear cache on quit so you must do it manually. ( ≡ → ⚙️ Settings → Data Management).
 
-website: 'https://firefox.com'
+website: 'https://www.mozilla.org/firefox/browsers/mobile/ios/'
 privacy_policy: 'https://www.mozilla.org/privacy/firefox'
 downloads:
   - icon: fab fa-app-store-ios
diff --git a/_data/software/browsers-mobile/3_firefox_focus.yml b/_data/software/browsers-mobile/3_firefox_focus.yml
index 0c177ba2..a7f35d81 100644
--- a/_data/software/browsers-mobile/3_firefox_focus.yml
+++ b/_data/software/browsers-mobile/3_firefox_focus.yml
@@ -2,9 +2,9 @@ title: Firefox Focus iOS
 type: Recommendation
 logo: /assets/img/browsers/firefox_focus.svg
 description: |
-  **Firefox** Focus iOS includes [Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-ios) which lets you select the blocklists ad trackers, analytic trackers, social trackers and other content tracking.
+  **Firefox** Focus iOS includes [Tracking Protection](https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-ios) which lets you select blocklists for ad trackers, analytic trackers, social trackers and other tracking content.
 
-  Focus also destroys browsing history on quit automatically which is a good way of automatically clearing cookies and website data regularly which is helpful to prevent tracking.
+  Focus also destroys browsing history on quit automatically. This is a good way of automatically clearing cookies and website data regularly which is helpful to prevent tracking.
 
   ##### **Sanitizing on close**
   Focus sanitizies all data on close by default. Pressing on the <img alt="iOS Garbage Bin icon" width="16" height="16" src="/assets/img/browsers/ios-trash.svg"/> will immediately destroy all cookies and website data for the entire session.
@@ -12,7 +12,7 @@ description: |
   #### Notes
   Focus only lets you open one tab at a time.
 
-website: 'https://firefox.com'
+website: 'https://www.mozilla.org/firefox/browsers/mobile/focus/'
 privacy_policy: 'https://www.mozilla.org/privacy/firefox'
 downloads:
   - icon: fab fa-app-store-ios
diff --git a/_data/software/browsers-resources/1_ublock_origin.yml b/_data/software/browsers-resources/1_ublock_origin.yml
index 5c9d3972..d61bf33e 100644
--- a/_data/software/browsers-resources/1_ublock_origin.yml
+++ b/_data/software/browsers-resources/1_ublock_origin.yml
@@ -6,7 +6,9 @@ description: |
 
   We suggest enabling all of the [filter lists](https://github.com/gorhill/uBlock/wiki/Dashboard:-Filter-lists) under the "Ads", "Privacy" and "Malware domains". The "Annoyances" and "Multipurpose" lists can also be enabled, but they may break some social media functions. The *AdGuard URL Tracking Protection* filter list makes extensions like CleanURLs and NeatURLs redundant.
 
-  We also suggest adding the [Actually Legitimate URL Shortener Tool](https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt) list and any of the regional lists that might apply to your browsing habits. Additional filter lists do slow things down, so only apply the languages that you use.
+  We also suggest adding the [Actually Legitimate URL Shortener Tool](https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt) list and any of the regional lists that might apply to your browsing habits. To add this list, first access settings by clicking on the uBO icon, then the settings icon (⚙️). Go to the bottom of the Filter lists pane and place a checkmark next to Import under the Custom section. Paste the URL of the filter list above into the text area that appears below and click "Apply changes".
+
+  Additional filter lists do slow things down, so only apply what you need.
 
   uBlock Origin also has different [blocking modes](https://github.com/gorhill/uBlock/wiki/Blocking-mode). The easy mode [might not](https://www.ranum.com/security/computer_security/editorials/dumb/) necessarily keep you safe from every tracker out there, whereas the more advanced modes let you control exactly what needs to run.
 website: 'https://addons.mozilla.org/firefox/addon/ublock-origin/'
diff --git a/_data/software/browsers-resources/2_terms_of_service_didnt_read.yml b/_data/software/browsers-resources/2_terms_of_service_didnt_read.yml
index 57c364d8..ae651f47 100644
--- a/_data/software/browsers-resources/2_terms_of_service_didnt_read.yml
+++ b/_data/software/browsers-resources/2_terms_of_service_didnt_read.yml
@@ -2,7 +2,7 @@ title: Terms of Service; Didn't Read
 type: Recommendation
 logo: /assets/img/browsers/terms_of_service_didnt_read.svg
 description: |
-  **Terms of Service; Didn't Read** grades websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.
+  **Terms of Service; Didn't Read** grades websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analyses and ratings are published transparently by a community of reviewers.
 
   We do not recommend installing ToS;DR as a browser extension. The same information is provided on their website.
 website: 'https://tosdr.org/'
diff --git a/_data/software/browsers/1_tor-browser.yml b/_data/software/browsers/1_tor-browser.yml
index b5feaef9..12f720d9 100644
--- a/_data/software/browsers/1_tor-browser.yml
+++ b/_data/software/browsers/1_tor-browser.yml
@@ -3,7 +3,7 @@ type: Recommendation
 info: Provides Anonymity
 logo: /assets/img/browsers/tor.svg
 description: |
-  **Tor Browser** is the choice if you need anonymity. This browser provides you with access to the Tor Bridges and Tor Network, along with extensions that can be automatically configured to fit its three security levels - *Standard*, *Safer* and *Safest*. We recommend that you do not change any of Tor Browser's default configurations outside of the standard security levels.
+  **Tor Browser** is the choice if you need anonymity. This browser provides you with access to the Tor Bridges and [Tor Network](https://en.wikipedia.org/wiki/Tor_(network)), along with extensions that can be automatically configured to fit its three security levels - *Standard*, *Safer* and *Safest*. We recommend that you do not change any of Tor Browser's default configurations outside of the standard security levels.
 
   #### Extensions
   You should **never** install any additional extensions on Tor Browser, including the ones we suggest for Firefox. Browser extensions make you stand out from other Tor users and your browser easier to [fingerprint](https://support.torproject.org/glossary/browser-fingerprinting).
diff --git a/collections/_evergreen/browsers.md b/collections/_evergreen/browsers.md
index 0290a9e6..32872e3f 100644
--- a/collections/_evergreen/browsers.md
+++ b/collections/_evergreen/browsers.md
@@ -2,7 +2,7 @@
 layout: evergreen
 title: Browser Recommendations
 description: |
-  These are our current web browser recommendations and settings you can use to preserve your privacy. 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.
+  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.
 ---
 
 ## General Recommendations
@@ -29,7 +29,7 @@ description: |
 
 ## Mobile Browser Recommendations
 
-On Android, Mozilla's engine [GeckoView](https://mozilla.github.io/geckoview/) has yet to support [site isolation](https://hacks.mozilla.org/2021/05/introducing-firefox-new-site-isolation-security-architecture) or enable [isolatedProcess](https://bugzilla.mozilla.org/show_bug.cgi?id=1565196). Firefox Android also doesn't yet have [HTTPS-Only mode](https://github.com/mozilla-mobile/fenix/issues/16952#issuecomment-907960218) built-in. We do not recommend Firefox or any Gecko based browsers at this time.
+On Android, Mozilla's engine [GeckoView](https://mozilla.github.io/geckoview/) has yet to support [site isolation](https://hacks.mozilla.org/2021/05/introducing-firefox-new-site-isolation-security-architecture) or enable [isolatedProcess](https://bugzilla.mozilla.org/show_bug.cgi?id=1565196). Firefox on Android also doesn't yet have [HTTPS-Only mode](https://github.com/mozilla-mobile/fenix/issues/16952#issuecomment-907960218) built-in. We do not recommend Firefox or any Gecko based browsers at this time.
 
 On iOS all web browsers use the [WebKit](https://en.wikipedia.org/wiki/WebKit) browser engine, including Firefox. However, Firefox includes a few extra features like Tracking Protection and the ability to add search engines.