Fix some typos, grammar, etc., and add details #1418
Labels
No Label
🔍🤖 Search Engines
approved
dependencies
duplicate
feedback wanted
high priority
I2P
iOS
low priority
OS
Self-contained networks
Social media
stale
streaming
todo
Tor
WIP
wontfix
XMPP
[m]
₿ cryptocurrency
ℹ️ help wanted
↔️ file sharing
⚙️ web extensions
✨ enhancement
❌ software removal
💬 discussion
🤖 Android
🐛 bug
💢 conflicting
📝 correction
🆘 critical
📧 email
🔒 file encryption
📁 file storage
🦊 Firefox
💻 hardware
🌐 hosting
🏠 housekeeping
🔐 password managers
🧰 productivity tools
🔎 research required
🌐 Social News Aggregators
🆕 software suggestion
👥 team chat
🔒 VPN
🌐 website issue
🚫 Windows
👁️ browsers
🖊️ digital notebooks
🗄️ DNS
🗨️ instant messaging (im)
🇦🇶 translations
No Milestone
No Assignees
1 Participants
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: privacyguides/privacytools.io#1418
Loading…
Reference in New Issue
No description provided.
Delete Branch "fix-some-typos-grammar-etc"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Description
Related to https://github.com/privacytoolsIO/privacytools.io/issues/1420 (but currently does not fix completely, i.e.. bolding)
Fixes https://github.com/privacytoolsIO/privacytools.io/issues/1417
This PR addresses some typos, grammar, consistency issues, etc. on both the website and repository. I did notice that for a lot of the entries the text was copied directly from site slogans or similar places with very little changes, resulting in several consistency issues.
The PR also adds in and corrects some other details about the services/software listed.
Changes to the website include
Changes to the repository include
Mention the Discourse community earlier in README.md (it only mentioned the subreddit in the first few paragraphs before).
Direct readers of CONTRIBUTING.md to the VPN section on the site as it contains more details on what criteria is used for recommending a VPN provider.
Change "i.e." to "e.g." in CONTRIBUTING.md. "i.e." is meant for equivalence/clarification while "e.g." is for giving examples. Therefore, we shouldn't say that a clarification/equivalence to open-source email software is IMAP.
Having IMAP access implies that you can access the email service using open-source software, but the converse isn't generally true since there's also POP3, or the case where the email provider does not support IMAP but has open-source clients of their own (like Tutanota).
Check List
I have read and understand the contributing guidelines.
The project is Free Libre and/or Open Source Software
Netlify preview for the mainly edited page: https://deploy-preview-1418--privacytools-io.netlify.com
Deploy preview for privacytools-io ready!
Built with commit
f549ad8f27
https://deploy-preview-1418--privacytools-io.netlify.com
I've also noticed that the bolding of text is not consistent. For example, compare https://www.privacytools.io/software/productivity/ with https://www.privacytools.io/software/real-time-communication/ and you can see that the software names in the description are bolded in the former link but not in the latter.
Without this change, it would have sounded like privacytools.io was hosting or offering self-contained networks.
The previous VPN entries use "killswitch" instead of "kill-switch," plus the Wikipedia article doesn't use "kill-switch" as a variant.
Time I allocated for email reading ran out and I will need to continue this later. I was able to view 5 files.
@ -10,3 +10,3 @@
**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
This may not be the best possible suggestion, but I think "forum" may be more generally understood than "Discourse", while everyone with any interest towards forums probably recognises the name.
Somewhat offtopic to this PR, but is anyone actually reading Reddit and opening issues based on it to GitHub?
Are you a native English speaker? I would like a comment from one, as I am not and I am not sure on this.
You expanded TBB? 👍
I think there is an issue somewhere on how our browser fingerprinting page is horrible as a side note.
@ -8,3 +8,3 @@
image="/assets/img/tools/Firefox.png"
description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
I miss a native English speaker here also, I don't think I have seen a dash in open source before.
This suggestion should have a nonbreakable space in case you are worried about that?
Does comma come, even if there is and?
See my previous comments.
See my previous comments.
@ -108,3 +108,3 @@
image="/assets/img/tools/onionbrowser.png"
description='Onion Browser is an open source browser that lets you browse the web anonymously over the Tor network on iOS devices, and is endorsed by the Tor Project. Warning: there are certain anonymity related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion browser due to iOS limitations.'
description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion Browser due to iOS limitations.'
website="https://onionbrowser.com/"
See my previous comments.
@ -133,3 +133,3 @@
- An open source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
- An open-source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
</li>
</ul>
What changed here?
See my previous comments.
See my previous comments.
@Mikaela Regarding the hyphen in "open - source":
Some of the other entries currently use a hyphen in "open-source" (the whole word is a compound adjective and they act as a single idea):
See some guides like https://www.grammarbook.com/punctuation/hyphens.asp that say some more about this. Here are some more usages of "open-source":
Wikipedia uses "open-source" in some of their articles: https://en.wikipedia.org/wiki/Open_source_(disambiguation)#Computing
Some dictionaries list "open-source" as an adjective, with the hyphen: https://www.merriam-webster.com/dictionary/open-source, https://dictionary.cambridge.org/us/dictionary/english/open-source, https://www.dictionary.com/browse/open--source
The Wikipedia article on https://en.wikipedia.org/wiki/Open_source does not use a hyphen (i.e., spells it is "open source" in the title, not "open-source), but it seems to talk about "open source" as a standalone idea rather than an adjective/adverb modifying some noun/verb. We can see that they end up using "open-source" later on in that article to describe software/products/etc. that are "open-source."
It's like the difference between "high school" and "high-school":
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586. "Open-source" is an adjective modifying "web browser"
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586. "Open-source" here is used as an adjective to modify "web browser."
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586. "Open-source" here is used as an adjective to modify browser.
@ -133,3 +133,3 @@
- An open source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
- An open-source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
</li>
</ul>
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586. "Open-source" is an adjective that modifies "web browser"
@ -108,3 +108,3 @@
image="/assets/img/tools/onionbrowser.png"
description='Onion Browser is an open source browser that lets you browse the web anonymously over the Tor network on iOS devices, and is endorsed by the Tor Project. Warning: there are certain anonymity related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion browser due to iOS limitations.'
description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion Browser due to iOS limitations.'
website="https://onionbrowser.com/"
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586. "Open-source" is an adjective that modifies "web browser"
@ -8,3 +8,3 @@
image="/assets/img/tools/Firefox.png"
description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
See https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586 for hyphens in open source. Dashes are different from hyphens (see https://en.wikipedia.org/wiki/Dash)
This is more of a style choice and either way is fine, but I think it's probably better to be consistent (I know it may seem overly pedantic). Some of the other sentences on privacytools.io use a serial comma, hence why I made this change. For example,
https://www.privacytools.io/providers/#ukusa,
https://www.privacytools.io/operating-systems/#win10
https://github.com/privacytoolsIO/privacytools.io/pull/1418#issuecomment-544284586
@ -10,3 +10,3 @@
**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
For consistency, I was following the usage of "Discourse community" as it is used later on in README.md under the "Support privacytools.io" header and on the privacytools.io site (https://www.privacytools.io/index.html#participate). If we're going to change this to "forum (Discourse)" then we should probably change all of those other strings as well.
One use of hyphens is that they're used create a compound adjective, which is when two or more words serve as a single adjective.
On second look (https://www.grammarbook.com/punctuation/hyphens.asp, https://en.wikipedia.org/wiki/Hyphen#Compound_modifiers, and English StackExchange), I guess the hyphen is not needed here since socially is an adverb (it modifies the adjective "motivated") that ends with -ly, and there's this rule about not hyphenating adverbs that end with -ly (it's not that ambiguous since "socially" clearly modifies "motivated" and not a type of website).
Yes, the full spelling of TBB was never indicated on the site so a casual reader most likely would not understand what it means. Even searching for TBB on Startpage or DuckDuckGo does not give "Tor Browser Bundle" as a top result. I don't think "Tor Browser Bundle" is stated anywhere else; I've only seen it on ptio as "Tor Browser."
100% on the serial comment train 👍
I'm going to change this suggestion a bit by using parallelism, e.g. we can start each list element as a gerund (circumventing, leaving, using instead of circumventing, it leaves, it uses)
Some thoughts I am unsure on.
' “I have read and agree to the Terms” is the biggest lie on the web' is what they're claiming (emphasis is mine). Should we agree with this, or take a more neutral stance and clarify that they are the ones that claim this?
Should we be quoting or not quoting? "The search engine that doesn't track you" is a sentence from DuckDuckGo's website and the previous iteration of this line didn't put the sentence in quotes. Without the quote, we'd be outright stating that DuckDuckGo doesn't track you (not necessarily verifiable)
@ -14,3 +14,3 @@
description="Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service and VPS provider."
description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
website="https://njal.la/"
tor="http://njalladnspotetti.onion"
Reason for change: Seeing as all the other cards on this page mention location in their descriptions, we should do the same for Njalla.
Njalla on this page mentions "Domain" as a service, and Orange Website offers domain registration (https://www.orangewebsite.com/domain-registration.php). Maybe we should also add Orange Website to providers/dns (maybe wait until https://github.com/privacytoolsIO/privacytools.io/issues/1259 passes).
@ -36,7 +36,7 @@ ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
<h3>Worth Mentioning</h3>
We don't say "a software" hence the change to "application"
I've noticed that the VPN section only gives a link to the website of the "Recommended VPN Service" (Mullvad); the "Other Providers Worth Mentioning" (IVPN and ProtonVPN) do nor have links to their websites.
Considering that we're already linking "Worth Mentioning" entries for other sections, should we give links to IVPN and ProtonVPN or are we treating VPNs as a special case?
Intentional.
And this PR looks fantastic, thanks 🙏