Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace all links to countermitm with securejoin urls and names #758

Merged
merged 1 commit into from
Nov 23, 2023
Merged

replace all links to countermitm with securejoin urls and names #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion en/gdpr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Delta Chat is an e-mail app that follows a strict privacy-by-design approach. Al
<tr>
<td>Confidentiality</td>
<td>
<b>End-to-end encryption</b> by implementing <a href="https://autocrypt.org">Autocrypt</a> and <a href="https://countermitm.readthedocs.io/en/latest/new.html">Verified groups</a>. User-friendly end-to-end encryption means that the requirements of the GDPR are already implemented at the technical level, <b>Privacy by Design</b>.
<b>End-to-end encryption</b> by implementing <a href="https://autocrypt.org">Autocrypt</a> and <a href="https://securejoin.delta.chat/en/latest/new.html">Verified groups</a>. User-friendly end-to-end encryption means that the requirements of the GDPR are already implemented at the technical level, <b>Privacy by Design</b>.
</td>
</tr>
<tr>
Expand Down
6 changes: 3 additions & 3 deletions en/help.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Autocrypt uses a limited and [secure subset of the OpenPGP standard](#openpgp-se
End-to-End encrypted messages are marked with a padlock
<img style="vertical-align:middle; width:1.2em; margin:1px" src="../assets/help/lock-icon.png" alt="padlock"/>.

[Secure-Join protocols](https://countermitm.readthedocs.io/en/latest/new.html)
[Secure-Join protocols](https://securejoin.delta.chat/en/latest/new.html)
are used for establishing chats with guaranteed end-to-end encryption
which protects against network attacks and compromised servers.
Chats marked with a green checkmark
Expand Down Expand Up @@ -326,7 +326,7 @@ One of you is the "Inviter", the other is the "Joiner".

**Both Inviter and Joiner**:

Wait while [Secure-Join network messages are exchanged](https://countermitm.readthedocs.io/en/latest/new.html#setup-contact-protocol) between both devices.
Wait while [Secure-Join network messages are exchanged](https://securejoin.delta.chat/en/latest/new.html#setup-contact-protocol) between both devices.

- If both devices are online,
both sides will eventually see a (group or direct) chat with a green checkmark
Expand Down Expand Up @@ -370,7 +370,7 @@ but there is no green checkmark in the profile title.
This usually means that the contact ["sent a message from another device"](#nocryptanymore).

For more in-depth discussion of "guaranteed end-to-end encryption"
please see [Secure-Join protocols](https://countermitm.readthedocs.io/en/latest/new.html)
please see [Secure-Join protocols](https://securejoin.delta.chat/en/latest/new.html)
and specifically read about "Verified Groups", the technical term
of what is called here "green-checkmarked" or "guaranteed end-to-end encrypted" chats.

Expand Down
2 changes: 1 addition & 1 deletion en/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lang: en

🥳 Enjoy interactive chat experiences through [webxdc apps](https://webxdc.org).

🔒 End-to-End Encryption using [Autocrypt](https://autocrypt.org) and [CounterMITM](https://countermitm.readthedocs.io/en/latest/new.html) protocols, with [multiple security audits](https://delta.chat/en/2023-03-27-third-independent-security-audit).
🔒 End-to-End Encryption using [Autocrypt](https://autocrypt.org) and [SecureJoin](https://securejoin.delta.chat/en/latest/new.html) protocols, with [multiple security audits](https://delta.chat/en/2023-03-27-third-independent-security-audit).

# Available on mobile and desktop

Expand Down