From 9cb9d4939e9a0ca00856ae35d2cbce594e672953 Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Tue, 30 Jun 2015 17:19:55 +0200 Subject: [PATCH 1/2] add note that encryption can't be disabled anymore --- admin_manual/release_notes.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 24eb25322..3b61635cc 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -66,7 +66,10 @@ requests. When you upgrade from ownCloud 8.0, with encryption enabled, to 8.1, you must enable the new encryption backend and migrate your encryption keys. See :doc:`configuration_files/encryption_configuration` - + +Encryption can no longer be disabled in ownCloud 8.1. It is planned to re-add +this feature to the command line client for the 8.2 release. + Due to various technical issues, by default desktop sync clients older than 1.7 are not allowed to connect and sync with the ownCloud server. This is configurable via the ``minimum.supported.desktop.version`` switch in From 90ede8058397074ddd98c9433064a0700041c54f Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Thu, 2 Jul 2015 15:44:52 +0200 Subject: [PATCH 2/2] implement feedback --- admin_manual/release_notes.rst | 2 +- user_manual/files/encrypting_files.rst | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 3b61635cc..dd2bcf265 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -68,7 +68,7 @@ enable the new encryption backend and migrate your encryption keys. See :doc:`configuration_files/encryption_configuration` Encryption can no longer be disabled in ownCloud 8.1. It is planned to re-add -this feature to the command line client for the 8.2 release. +this feature to the command line client for a future release. Due to various technical issues, by default desktop sync clients older than 1.7 are not allowed to connect and sync with the ownCloud server. This is diff --git a/user_manual/files/encrypting_files.rst b/user_manual/files/encrypting_files.rst index ababe9f8d..4d45b02d6 100644 --- a/user_manual/files/encrypting_files.rst +++ b/user_manual/files/encrypting_files.rst @@ -80,21 +80,6 @@ restore your files if you lose your login password. .. figure:: ../images/encryption3.png -Removing Encryption -------------------- - -If your ownCloud administrator elects to disable the Encryption app, you will -be prompted to go to your Personal page and enter your password on the -Encryption form to decrypt your files. - -.. figure:: ../images/encryption4.png - -If your files decrypt successfully, you can click the ``Delete encryption -keys`` button. There is no reason to save them after disabling decryption, -because if encryption is enabled again you'll generate a new set of keys. Your -keys are preserved in case something goes wrong with the decryption and you -need your keys to access your files. - Files Not Encrypted -------------------