aboutsummaryrefslogtreecommitdiff
path: root/doc/encryption.mdwn
diff options
context:
space:
mode:
authorGravatar Mesar Hameed <mesar.hameed@gmail.com>2014-07-19 23:25:42 +0100
committerGravatar Mesar Hameed <mesar.hameed@gmail.com>2014-07-19 23:25:42 +0100
commitfa20ec3b4c873146306e59faddb4054b0e68a10a (patch)
treecbcd0fd5709c624d7074c81f61eec0201e1ded59 /doc/encryption.mdwn
parent0b60b9a9e2a0c0127a9fd979fc4917fe4ae1bddc (diff)
fix typos.
Diffstat (limited to 'doc/encryption.mdwn')
-rw-r--r--doc/encryption.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn
index ecc908463..0dac527df 100644
--- a/doc/encryption.mdwn
+++ b/doc/encryption.mdwn
@@ -18,7 +18,7 @@ You should decide whether to use encryption with a special remote before
any data is stored in it. So, `git annex initremote` requires you
to specify "encryption=none" when first setting up a remote in order
to disable encryption. To use encryption, you run
-run `git-annex initremote` in one of these ways:
+`git-annex initremote` in one of these ways:
* `git annex initremote newremote type=... encryption=hybrid keyid=KEYID ...`
* `git annex initremote newremote type=... encryption=shared`
@@ -43,7 +43,7 @@ enableremote` specifying the new encryption key:
git annex enableremote myremote keyid+=788A3F4C
While a key can later be removed from the list, note that
-that will **not** necessarily prevent the owner of the key
+it will **not** necessarily prevent the owner of the key
from accessing data on the remote (which is by design impossible to prevent,
short of deleting the remote). In fact the only sound use of `keyid-=` is
probably to replace a revoked key:
@@ -74,7 +74,7 @@ and since it's exactly the way everyone else uses gpg.
git annex initremote newremote type=.... encryption=pubkey keyid=KEYID ...
-A disavantage is that is not easy to later add additional public keys
+A disavantage is that it is not easy to later add additional public keys
to the special remote. While the `enableremote` parameters `keyid+=` and
`keyid-=` can be used, they have **no effect** on files that are already
present on the remote. Probably the only use for these parameters is
@@ -94,7 +94,7 @@ generated (and encrypted to the given key IDs).)
## MAC algorithm
The default MAC algorithm to be applied on the filenames is HMACSHA1. A
-stronger one, for instance HMACSHA512, one can be chosen upon creation
+stronger one, for instance HMACSHA512, can be chosen upon creation
of the special remote with the option `mac=HMACSHA512`. The available
MAC algorithms are HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384, and
HMACSHA512. Note that it is not possible to change algorithm for a