Fix some typos, grammar, etc., and add details (#1418)

* Fix some typos, grammar, etc. on the site

Fixes some issues with typos, capitalization, grammar, and et cetera.

* Fix typo, grammar, etc. in repository

* Update README.md
Mention Discourse community earlier, add missing period

* Update CONTRIBUTING.md
i.e. is used for equivalence or clarification while e.g. is for
examples. For instance, we shouldn't say that IMAP is equivalent or an
explanation to all open-source software used to access email (e.g.
there's POP3, open-source clients to access when there isn't IMAP such
as Tutanota, etc.).

We also shouldn't call IMAP open-source software since it's a protocol.

* Change "socially motivated

* Apply suggestions from code review

Co-Authored-By: Jonah Aragon <jonah@triplebit.net>

* Suggestion from code review with extras

* 'Kill switch' to 'Killswitch"

* Consistency and minor additions to details

- More parallel sentence structures, following <Name> <Verb phrase>
for the first sentence of cards. Related to issue #1420.
- Make Njalla parallel to the others, and mention Njalla
is based in Nevis with VPS in Sweden
- Don't use "us" when talking about external services
- Orange Website also provides domain registration
- Update capitalization and add more hyphens
- Mention that TOS;DR evaluations are done by the community and that
  they also evaluate privacy policies (see https://edit.tosdr.org/about)
- "E2EE encryption" is redundant since "E2EE" already has "encryption"
in it. Might as well expand it since full term is used later on.
- <Name> <Verb phrase> structure for Magic Wormhole
- For consistency, don't start Worth Mentioning entries with the name
- https://english.stackexchange.com/questions/27707/post-hyphenation-of-split-compound-words
- All the other "alert alert-warning" don't repeat the generic name and 
we also don't say 'a software'

* instant-messenger: Remove <em>, more cleanup

* voice-video-messenger: Hyphens and cleanup

- We don't say "a software" so replace it with something that works

* paste-services: Cleanup & change cryptography info

As per CryptPad's whitepaper and FAQ:
https://cryptpad.fr/faq.html#security-crypto
https://blog.cryptpad.fr/images/CryptPad-Whitepaper-v1.0.pdf

Fixes #1417.

* encryption: "open-source"

* Page descriptions and other cleanup
This commit is contained in:
djoate
2019-10-25 22:58:01 -07:00
committed by Jonah Aragon
parent 79b6e0810b
commit c6ee840c9d
41 changed files with 121 additions and 120 deletions

View File

@ -1,13 +1,13 @@
<h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
<div class="alert alert-warning" role="alert">
<strong> If you are currently using search engines like Google, Bing or Yahoo, you should pick an alternative here. </strong>
<strong> If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here. </strong>
</div>
{% include cardv2.html
title="searx - Decentral"
image="/assets/img/provider/searx.png"
description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
website="https://searx.me/"
tor="http://ulrn6sryqaifefld.onion"
forum="https://forum.privacytools.io/t/discussion-searx/283"
@ -17,7 +17,7 @@ github="https://github.com/asciimoo/searx"
{% include cardv2.html
title="StartPage - Netherlands"
image="/assets/img/provider/StartPage.png"
description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
description="StartPage is a search engine that provides Google search results with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
website="https://www.startpage.com/"
forum="https://forum.privacytools.io/t/discussion-startpage/284"
%}
@ -25,7 +25,7 @@ forum="https://forum.privacytools.io/t/discussion-startpage/284"
{% include cardv2.html
title="DuckDuckGo - USA"
image="/assets/img/provider/DuckDuckGo.png"
description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
website="https://duckduckgo.com/"
tor="http://3g2upl4pq6kufc4m.onion"
forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
@ -35,7 +35,7 @@ github="https://github.com/duckduckgo"
{% include cardv2.html
title="Qwant - France"
image="/assets/img/provider/Qwant.png"
description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>'
description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
website="https://www.qwant.com/"
forum="https://forum.privacytools.io/t/discussion-qwant/286"
github="https://github.com/Qwant/"
@ -54,8 +54,8 @@ github="https://github.com/Qwant/"
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>
<li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
<li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
<li><a href="https://yacy.net/">YaCy</a> - A free-software P2P search engine powered by its users.</a></li>
<li><a href="https://jivesearch.com/">Jive Search</a> - A free-software search engine with a similar look and feel to Google.</a></li>
<li><a href="https://metager.de/en/">MetaGer</a> - An open-source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
<li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
</ul>