khanh.pndc/nextcloud-docs
1
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2026-01-02 17:59:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #173 from jbicha/stable5

Browse Source 
looses -> loses and fix possessive users' or user's instead of users
This commit is contained in:
Bernhard Posselt
2013-09-11 14:16:04 -07:00
parent 876157493b bf1db86f8a
commit 803db6ae75
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -22,7 +22,7 @@ Manuals
At this point, this repository hosts three manuals:
* **Users Manual:** Covers topics from an end users Point of View
* **Users Manual:** Covers topics from an end user's Point of View
* **Administrators Manual:** Setup, Deployment, Best Practices, etc.
* **Developers Manual:** Developing Apps for ownCloud & understanding the core Architecture.

22
admin_manual/configuration/configuration_encryption.rst
View File

@@ -6,8 +6,8 @@ your ownCloud. Encryption and decryption always happens server-side. This
enables the user to continue to use all the other apps to view and edit his
data.
The app uses the users log-in password as encryption-password. This means that
by default the user will loose access to his files if he looses his log-in
The app uses the user's log-in password as encryption-password. This means that
by default the user will lose access to his files if he loses his log-in
password.
It might be a good idea to make regular backups of all encryption keys. The
@@ -15,8 +15,8 @@ encryption keys are stored in following folders:
* data/owncloud_private_key (recovery key, if enabled and public share key)
* data/public-keys (public keys from all users)
* data/<user>/files_encryption (users private key and all other keys necessary to
decrypt the users files)
* data/<user>/files_encryption (users' private keys and all other keys necessary to
decrypt the users' files)
Enable File Recovery Feature
----------------------------
@@ -25,7 +25,7 @@ The admin can offer the user some kind of protection against password
loss. Therefore you have to enable the recovery key in the admin settings and
provide a strong recovery key password. The admin settings also enables you to
change the recovery key password if you wish. But you should make sure to never
loose this password, because that's the only way to recover users files.
lose this password, because that's the only way to recover users' files.
Once the recovery key was enabled every user can choose in his personal
settings to enable this feature or not.
@@ -35,22 +35,22 @@ Recover User Files
If the recovery feature was enabled the admin will see a additional input field
at the top of the user management settings. After entering the recovery-key
password the admin can change the users log-in password which will
automatically recover the users file.
password the admin can change the user's log-in password which will
automatically recover the user's file.
If you use a user back-end which doesn't allow you to change the log-in
password directly within ownCloud, e.g. the LDAP back-end, than you can follow
the same procedure to recover users files. The only difference is that
the same procedure to recover a user's files. The only difference is that
you need to change the log-in password additionally at your back-end. In this
case make sure to use both times the same password.
LDAP and other external user back-ends
--------------------------------------
if you configure a external user back-end you will be able to change the users log-in password
at the back-end. Since the encryption password must be the same as the users log-in password
if you configure a external user back-end you will be able to change the user's log-in password
at the back-end. Since the encryption password must be the same as the user's log-in password
this will result in a non-functional encryption system. If the recovery feature was enabled,
the administrator will be able to recover the users files directly over the recovery feature.
the administrator will be able to recover the user's files directly over the recovery feature.
See the description above. Otherwise the user will be informed that his log-in password and
his encryption password no longer matchs after his next log-in. In this case the user will be
able to adjust his encryption password in the personal settings by providing both, his old and