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

@ -26,7 +26,7 @@ ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
{% include cardv2.html
title="Wire"
image="/assets/img/tools/wire.png"
description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
description="Wire is a free and end-to-end encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
website="https://wire.com/"
forum="https://forum.privacytools.io/t/discussion-wire/750"
@ -53,19 +53,19 @@ web="https://app.wire.com"
<ul>
<li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.</li>
<li><a href="https://about.riot.im/">Riot</a> - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.</li>
<li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
<li><a href="https://retroshare.cc/">RetroShare</a> - An end-to-end encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
<li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
<ul>
<li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
<li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
<li><a href="https://conversations.im/">Conversations</a> (Android) - An open-source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
<li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open-source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
<li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
<li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
<li><a href="https://omemo.top/">Other OMEMO-ready clients</a>.</li>
</ul>
<li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
<li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
<li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
<li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
<li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging, and video calling software. <span class="badge badge-success">VoIP</span></li>
<li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, and video conferencing. <span class="badge badge-success">VoIP</span></li>
</ul>