diff --git a/docs/api/index.html b/docs/api/index.html index 64e5de62b8..7dd1bd56b0 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/api.md -!!! WARNING !!! - --> diff --git a/docs/changelog/index.html b/docs/changelog/index.html index 6d01106c54..a18f5b5cb9 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/changelog.md -!!! WARNING !!! - --> diff --git a/docs/changelog_cli/index.html b/docs/changelog_cli/index.html index 249b61c084..837f9d4d3a 100644 --- a/docs/changelog_cli/index.html +++ b/docs/changelog_cli/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md -!!! WARNING !!! - --> diff --git a/docs/clipper/index.html b/docs/clipper/index.html index 25683c8552..b1af1f6030 100644 --- a/docs/clipper/index.html +++ b/docs/clipper/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/clipper.md -!!! WARNING !!! - --> diff --git a/docs/debugging/index.html b/docs/debugging/index.html index 0c36857343..8945583afe 100644 --- a/docs/debugging/index.html +++ b/docs/debugging/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/debugging.md -!!! WARNING !!! - --> diff --git a/docs/desktop/index.html b/docs/desktop/index.html index 7960f2cf48..4e961d3dff 100644 --- a/docs/desktop/index.html +++ b/docs/desktop/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/desktop.md -!!! WARNING !!! - --> diff --git a/docs/donate/index.html b/docs/donate/index.html index f5ccf70731..53b8f61262 100644 --- a/docs/donate/index.html +++ b/docs/donate/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/donate.md -!!! WARNING !!! - --> diff --git a/docs/e2ee/index.html b/docs/e2ee/index.html index b3aa78e8cb..86c141376f 100644 --- a/docs/e2ee/index.html +++ b/docs/e2ee/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/e2ee.md -!!! WARNING !!! - --> @@ -289,7 +287,7 @@ https://github.com/laurent22/joplin/blob/master/readme/e2ee.md

The system is designed to defeat any attempts at surveillance or tampering because no third party can decipher the data being communicated or stored.

There is a small overhead to using E2EE since data constantly has to be encrypted and decrypted so consider whether you really need the feature.

🔗Enabling E2EE

-

Due to the decentralised nature of Joplin, E2EE needs to be manually enabled on a single device first (this will create a Master Key for encryption secured by your password) and then it must be synced with all other remaining devices. It is recommended to start with the desktop or terminal application since they generally run on more powerful devices (unlike the mobile application), and so they can encrypt the initial data faster.

+

Due to the decentralised nature of Joplin, E2EE needs to be manually enabled on all the applications that you synchronise with. It is recommended to first enable it on the desktop or terminal application since they generally run on more powerful devices (unlike the mobile application), and so they can encrypt the initial data faster.

To enable it, please follow these steps:

  1. On your first device (eg. on the desktop application), go to the Encryption Config screen and click "Enable encryption"
  2. @@ -299,7 +297,6 @@ https://github.com/laurent22/joplin/blob/master/readme/e2ee.md
  3. Once this first synchronisation operation is done, open the next device you are synchronising with. Click "Synchronise" and wait for the sync operation to complete. The device will receive the master key, and you will need to provide the password for it. At this point E2EE will be automatically enabled on this device. Once done, click Synchronise again and wait for it to complete.
  4. Repeat step 5 for each device.
-

Do not manually enable encryption on multiple devices in parallel, but rather wait for the other ones to sync with the first already encrypted device. Otherwise, you may end up with multiple encryption keys (which is supported by Joplin but most probably not what you want).

Once all the devices are in sync with E2EE enabled, the encryption/decryption should be mostly transparent. Occasionally you may see encrypted items but they will get decrypted in the background eventually.

🔗Disabling E2EE

Follow the same procedure as above but instead disable E2EE on each device one by one. Again it might be simpler to do it one device at a time and to wait every time for the synchronisation to complete.

diff --git a/docs/faq/index.html b/docs/faq/index.html index d5234c2b9a..3e143aa48a 100644 --- a/docs/faq/index.html +++ b/docs/faq/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/faq.md -!!! WARNING !!! - --> diff --git a/docs/index.html b/docs/index.html index 5c0d7cf6c2..97aa121e6c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/ -!!! WARNING !!! - --> diff --git a/docs/mobile/index.html b/docs/mobile/index.html index 4340904872..e180942c81 100644 --- a/docs/mobile/index.html +++ b/docs/mobile/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/mobile.md -!!! WARNING !!! - --> diff --git a/docs/prereleases/index.html b/docs/prereleases/index.html index 84913b2d9b..648629712b 100644 --- a/docs/prereleases/index.html +++ b/docs/prereleases/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/prereleases.md -!!! WARNING !!! - --> diff --git a/docs/spec/index.html b/docs/spec/index.html index 707c73564e..b9631dc10f 100644 --- a/docs/spec/index.html +++ b/docs/spec/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/spec.md -!!! WARNING !!! - --> diff --git a/docs/stats/index.html b/docs/stats/index.html index 2a247db59e..c0c2fc6ab8 100644 --- a/docs/stats/index.html +++ b/docs/stats/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/stats.md -!!! WARNING !!! - --> diff --git a/docs/terminal/index.html b/docs/terminal/index.html index bae42b4a0f..3e0e0c1724 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -11,8 +11,6 @@ the source Markdown file: https://github.com/laurent22/joplin/blob/master/readme/terminal.md -!!! WARNING !!! - -->