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/S3.mdwn | |
| parent | 652f4069fc1ddc7b5cef4fa40865997210cf7a7a (diff) | |
update docs for changed initremote encryption syntax
Diffstat (limited to 'doc/special_remotes/S3.mdwn')
| -rw-r--r-- | doc/special_remotes/S3.mdwn | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn index e15361f3e..5291a4eb6 100644 --- a/doc/special_remotes/S3.mdwn +++ b/doc/special_remotes/S3.mdwn @@ -15,13 +15,10 @@ can read inside the local git repository. A number of parameters can be passed to `git annex initremote` to configure the S3 remote. -* `encryption` - Required. Either "none" to disable encryption (not recommended), - 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). +* `encryption` - One of "none", "hybrid", "shared", or "pubkey". + See [[encryption]]. - Note that additional gpg keys can be given access to a remote by - running enableremote with the new key id. See [[encryption]]. +* `keyid` - Specifies the gpg key to use for [[encryption]]. * `embedcreds` - Optional. Set to "yes" embed the login credentials inside the git repository, which allows other clones to also access them. This is |