From 5dd8f91f0d50e852c5a2c7e33f2431672ed0731d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Tue, 13 Aug 2019 14:36:48 +0200 Subject: [PATCH] en: propagate changes to mac.html and windows.html (enc f511514c), and use the same footer for all pages. --- en/mac.html | 25 ++++++++++++------------ en/windows.html | 25 ++++++++++++------------ en/workshops.html | 49 ++++++++++++----------------------------------- 3 files changed, 36 insertions(+), 63 deletions(-) diff --git a/en/mac.html b/en/mac.html index c78f6ec..67d408a 100644 --- a/en/mac.html +++ b/en/mac.html @@ -291,7 +291,7 @@ look up your public key.

Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key together to descramble encrypted emails other people send to you. You should never share you private key with anyone, under any +bold;">You should never share your private key with anyone, under any circumstances.

In addition to encryption and decryption, you can also use these keys to @@ -659,20 +659,12 @@ HTML. Instead, you can render the message body as plain text.

Step 3.c Receive a response

When Edward receives your email, he will use his private key to decrypt -it, then use your public key (which you sent him in Step -3.A) to encrypt his reply to you.

+it, then reply to you.

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

-

When you receive Edward's email and open it, Enigmail will automatically -detect that it is encrypted with your public key, and then it will use your -private key to decrypt it.

- -

Notice the bar that Enigmail shows you above the message, with information -about the status of Edward's key.

- @@ -711,9 +703,9 @@ be encrypted, signed, both, or neither.

Step 3.e Receive a response

-

When Edward receives your email, he will use your public key (which you -sent him in Step 3.A) to verify that your signature -is authentic and the message you sent has not been tampered with.

+

When Edward receives your email, he will use your public key (which +you sent him in Step 3.A) to verify the message +you sent has not been tampered with and to encrypt his reply to you.

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the +

When you receive Edward's email and open it, Enigmail will +automatically detect that it is encrypted with your public key, and +then it will use your private key to decrypt it.

+ +

Notice the bar that Enigmail shows you above the message, with +information about the status of Edward's key.

+ diff --git a/en/windows.html b/en/windows.html index 76239c1..d2b7c26 100644 --- a/en/windows.html +++ b/en/windows.html @@ -291,7 +291,7 @@ look up your public key.

Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key together to descramble encrypted emails other people send to you. You should never share you private key with anyone, under any +bold;">You should never share your private key with anyone, under any circumstances.

In addition to encryption and decryption, you can also use these keys to @@ -659,20 +659,12 @@ HTML. Instead, you can render the message body as plain text.

Step 3.c Receive a response

When Edward receives your email, he will use his private key to decrypt -it, then use your public key (which you sent him in Step -3.A) to encrypt his reply to you.

+it, then reply to you.

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

-

When you receive Edward's email and open it, Enigmail will automatically -detect that it is encrypted with your public key, and then it will use your -private key to decrypt it.

- -

Notice the bar that Enigmail shows you above the message, with information -about the status of Edward's key.

- @@ -711,9 +703,9 @@ be encrypted, signed, both, or neither.

Step 3.e Receive a response

-

When Edward receives your email, he will use your public key (which you -sent him in Step 3.A) to verify that your signature -is authentic and the message you sent has not been tampered with.

+

When Edward receives your email, he will use your public key (which +you sent him in Step 3.A) to verify the message +you sent has not been tampered with and to encrypt his reply to you.

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the +

When you receive Edward's email and open it, Enigmail will +automatically detect that it is encrypted with your public key, and +then it will use your private key to decrypt it.

+ +

Notice the bar that Enigmail shows you above the message, with +information about the status of Edward's key.

+ diff --git a/en/workshops.html b/en/workshops.html index 8241398..20d3310 100644 --- a/en/workshops.html +++ b/en/workshops.html @@ -323,34 +323,6 @@ let us know at campaigns@fsf.org.

- - - - - - - + + - +--> + - -- 2.25.1