diff options
| author |  Yaroslav Halchenko <debian@onerussian.com> | 2014-08-19 01:22:24 -0400 |
|---|---|---|
| committer | Yaroslav Halchenko <debian@onerussian.com> | 2014-08-19 01:22:24 -0400 |
| commit | b15839a9acaedfaa3e00b165b7b0a4048522669f (patch) | |
| tree | 3d03da3352ecd8bdd8b78095de10330543c59539 /doc/encryption.mdwn | |
| parent | 11c95f60f9329bc50d52b834100549aaa8071e05 (diff) | |
doc/ minor typos/trailing whitespaces + extension on get options
Diffstat (limited to 'doc/encryption.mdwn')
| -rw-r--r-- | doc/encryption.mdwn | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn index 0dac527df..3cbc37ee3 100644 --- a/doc/encryption.mdwn +++ b/doc/encryption.mdwn @@ -17,7 +17,7 @@ remote. 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 +to disable encryption. To use encryption, you run `git-annex initremote` in one of these ways: * `git annex initremote newremote type=... encryption=hybrid keyid=KEYID ...` @@ -29,10 +29,10 @@ to disable encryption. To use encryption, you run The [[hybrid_key_design|design/encryption]] allows additional encryption keys to be added on to a special remote later. Due to this flexibility, it is the default and recommended encryption scheme. - + git annex initremote newremote type=... [encryption=hybrid] keyid=KEYID ... -Here the KEYID(s) are passed to `gpg` to find encryption keys. +Here the KEYID(s) are passed to `gpg` to find encryption keys. Typically, you will say "keyid=2512E3C7" to use a specific gpg key. Or, you might say "keyid=joey@kitenet.net" to search for matching keys. @@ -58,8 +58,8 @@ risks associated with encryption. Alternatively, you can configure git-annex to use a shared cipher to encrypt data stored in a remote. This shared cipher is stored, **unencrypted** in the git repository. So it's shared among every -clone of the git repository. - +clone of the git repository. + git annex initremote newremote type=... encryption=shared The advantage is you don't need to set up gpg keys. The disadvantage is @@ -74,10 +74,10 @@ and since it's exactly the way everyone else uses gpg. git annex initremote newremote type=.... encryption=pubkey keyid=KEYID ... -A disavantage is that it is not easy to later add additional public keys +A disadvantage 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 +present on the remote. Probably the only use for these parameters is to replace a revoked key: git annex enableremote myremote keyid-=2512E3C7 keyid+=788A3F4C |