diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-04 23:46:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-04 23:46:50 -0400 |
| commit | 2f3b108d49c534e828cec8adceef7defc942b67f (patch) | |
| tree | a900acd6ed02e6342b76f1fe11294c889e62ff08 /doc/special_remotes/bup.mdwn | |
| parent | 652f4069fc1ddc7b5cef4fa40865997210cf7a7a (diff) | |
update docs for changed initremote encryption syntax
Diffstat (limited to 'doc/special_remotes/bup.mdwn')
| -rw-r--r-- | doc/special_remotes/bup.mdwn | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/doc/special_remotes/bup.mdwn b/doc/special_remotes/bup.mdwn index f323237b1..f2d465e77 100644 --- a/doc/special_remotes/bup.mdwn +++ b/doc/special_remotes/bup.mdwn @@ -19,14 +19,10 @@ for example; or clone bup's git repository to further back it up. These parameters can be passed to `git annex initremote` to configure bup: -* `encryption` - Required. Either "none" to disable encryption of content - stored in bup (ssh will still be used to transport it securely), - or a value that can be looked up (using gpg -k) to find a gpg encryption - key that will be given access to the remote, or "shared" which allows - every clone of the repository to access the encrypted data (use with caution). - - Note that additional gpg keys can be given access to a remote by - running enableremote with the new key id. See [[encryption]]. +* `encryption` - One of "none", "hybrid", "shared", or "pubkey". + See [[encryption]]. + +* `keyid` - Specifies the gpg key to use for [[encryption]]. * `buprepo` - Required. This is passed to `bup` as the `--remote` to use to store data. To create the repository,`bup init` will be run. |