Skip to content

Commit bf1db86

Browse files
committed
looses -> loses and fix possessive users' or user's instead of users
1 parent 8761574 commit bf1db86

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Manuals
2222

2323
At this point, this repository hosts three manuals:
2424

25-
* **Users Manual:** Covers topics from an end users Point of View
25+
* **Users Manual:** Covers topics from an end user's Point of View
2626
* **Administrators Manual:** Setup, Deployment, Best Practices, etc.
2727
* **Developers Manual:** Developing Apps for ownCloud & understanding the core Architecture.
2828

admin_manual/configuration/configuration_encryption.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ your ownCloud. Encryption and decryption always happens server-side. This
66
enables the user to continue to use all the other apps to view and edit his
77
data.
88

9-
The app uses the users log-in password as encryption-password. This means that
10-
by default the user will loose access to his files if he looses his log-in
9+
The app uses the user's log-in password as encryption-password. This means that
10+
by default the user will lose access to his files if he loses his log-in
1111
password.
1212

1313
It might be a good idea to make regular backups of all encryption keys. The
1414
encryption keys are stored in following folders:
1515

1616
* data/owncloud_private_key (recovery key, if enabled and public share key)
1717
* data/public-keys (public keys from all users)
18-
* data/<user>/files_encryption (users private key and all other keys necessary to
19-
decrypt the users files)
18+
* data/<user>/files_encryption (users' private keys and all other keys necessary to
19+
decrypt the users' files)
2020

2121
Enable File Recovery Feature
2222
----------------------------
@@ -25,7 +25,7 @@ The admin can offer the user some kind of protection against password
2525
loss. Therefore you have to enable the recovery key in the admin settings and
2626
provide a strong recovery key password. The admin settings also enables you to
2727
change the recovery key password if you wish. But you should make sure to never
28-
loose this password, because that's the only way to recover users files.
28+
lose this password, because that's the only way to recover users' files.
2929

3030
Once the recovery key was enabled every user can choose in his personal
3131
settings to enable this feature or not.
@@ -35,22 +35,22 @@ Recover User Files
3535

3636
If the recovery feature was enabled the admin will see a additional input field
3737
at the top of the user management settings. After entering the recovery-key
38-
password the admin can change the users log-in password which will
39-
automatically recover the users file.
38+
password the admin can change the user's log-in password which will
39+
automatically recover the user's file.
4040

4141
If you use a user back-end which doesn't allow you to change the log-in
4242
password directly within ownCloud, e.g. the LDAP back-end, than you can follow
43-
the same procedure to recover users files. The only difference is that
43+
the same procedure to recover a user's files. The only difference is that
4444
you need to change the log-in password additionally at your back-end. In this
4545
case make sure to use both times the same password.
4646

4747
LDAP and other external user back-ends
4848
--------------------------------------
4949

50-
if you configure a external user back-end you will be able to change the users log-in password
51-
at the back-end. Since the encryption password must be the same as the users log-in password
50+
if you configure a external user back-end you will be able to change the user's log-in password
51+
at the back-end. Since the encryption password must be the same as the user's log-in password
5252
this will result in a non-functional encryption system. If the recovery feature was enabled,
53-
the administrator will be able to recover the users files directly over the recovery feature.
53+
the administrator will be able to recover the user's files directly over the recovery feature.
5454
See the description above. Otherwise the user will be informed that his log-in password and
5555
his encryption password no longer matchs after his next log-in. In this case the user will be
5656
able to adjust his encryption password in the personal settings by providing both, his old and

0 commit comments

Comments
 (0)