Merge branch 'man-vs-machine' into 'nina/redesign'

Wording: "machine-in-the-middle" (instead of "man").

See merge request schleuder/schleuder-website!81

3 files changed, 6 insertions, 6 deletions

diff --git a/schleuder/docs/concept.md b/schleuder/docs/concept.md
index ac25654..5339656 100644
--- a/schleuder/docs/concept.md
+++ b/schleuder/docs/concept.md
@@ -33,9 +33,9 @@ And Schleuder can receive administrative commands by email. E.g. it is possible
 
 ## Technical details
 
-### A "wanted man-in-the-middle"
+### A "wanted machine-in-the-middle"
 
-Basically Schleuder is a "wanted man-in-the-middle".
+Basically Schleuder is a "wanted machine-in-the-middle".
 
 Each list has its own keypair. Schleuder decrypts every incoming email and verifies its signature with the keys from the list's keyring. Then Schleuder loops over the list of subscribers, creates for each a stripped down copy of the message, encrypts it with the subscriber's key and signs it with its own key, and sends it out.
 
diff --git a/schleuder/docs/older/3.2/concept.md b/schleuder/docs/older/3.2/concept.md
index a4b87e0..9244e0e 100644
--- a/schleuder/docs/older/3.2/concept.md
+++ b/schleuder/docs/older/3.2/concept.md
@@ -31,9 +31,9 @@ And Schleuder can receive administrative commands by email. E.g. it is possible
 
 ## Technical details
 
-### A "wanted man-in-the-middle"
+### A "wanted machine-in-the-middle"
 
-Basically Schleuder is a "wanted man-in-the-middle".
+Basically Schleuder is a "wanted machine-in-the-middle".
 
 Each list has its own keypair. Schleuder decrypts every incoming email and verifies its signature with the keys from the list's keyring. Then Schleuder loops over the list of subscribers, creates for each a stripped down copy of the message, encrypts it with the subscriber's key and signs it with its own key, and sends it out.
 
diff --git a/schleuder/docs/older/3.3/concept.md b/schleuder/docs/older/3.3/concept.md
index fc917a1..fc9e0d1 100644
--- a/schleuder/docs/older/3.3/concept.md
+++ b/schleuder/docs/older/3.3/concept.md
@@ -31,9 +31,9 @@ And Schleuder can receive administrative commands by email. E.g. it is possible
 
 ## Technical details
 
-### A "wanted man-in-the-middle"
+### A "wanted machine-in-the-middle"
 
-Basically Schleuder is a "wanted man-in-the-middle".
+Basically Schleuder is a "wanted machine-in-the-middle".
 
 Each list has its own keypair. Schleuder decrypts every incoming email and verifies its signature with the keys from the list's keyring. Then Schleuder loops over the list of subscribers, creates for each a stripped down copy of the message, encrypts it with the subscriber's key and signs it with its own key, and sends it out.