summaryrefslogtreecommitdiff
path: root/doc/special_remotes
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-29 15:12:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-29 15:12:07 -0400
commite62f9816ab29dceb5489d520b9cf569ede2ffb52 (patch)
tree97563eafbe702e834a1f32b38f6218bd4a4c831e /doc/special_remotes
parent0a4c610b4fd78f7d1589117cb723d7d8c15c120c (diff)
doc update for S3
Diffstat (limited to 'doc/special_remotes')
-rw-r--r--doc/special_remotes/Amazon_S3.mdwn6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/special_remotes/Amazon_S3.mdwn b/doc/special_remotes/Amazon_S3.mdwn
index 42c4a5453..c8e44b609 100644
--- a/doc/special_remotes/Amazon_S3.mdwn
+++ b/doc/special_remotes/Amazon_S3.mdwn
@@ -8,7 +8,7 @@ See [[walkthrough/using_Amazon_S3]] for usage examples.
A number of parameters can be passed to `git annex initremote` to configure
the S3 remote.
-* `encryption` - Either "none" to disable encryption,
+* `encryption` - Required. Either "none" to disable encryption,
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. Note that additional gpg
keys can be given access to a remote by rerunning initremote with
@@ -24,6 +24,10 @@ the S3 remote.
* `host` and `port` - Specify in order to use a different, S3 compatable
service.
+* `bucket` - S3 requires that buckets have a globally unique name,
+ so by default, a bucket name is chosen based on the remote name
+ and UUID. This can be specified to pick a bucket name.
+
## data security
When encryption=none, there is **no** protection against your data being read