aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-05-29 15:01:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-05-29 15:01:36 -0400
commitf97009fffe18570a01ecda6af25807f33999dd1f (patch)
tree7d043b8cf5fbac6ec7b7dbb5f54e7dac648db21c
parenta8ab3c6123f43ff6832c79459fd57ddf6e3c1e9e (diff)
correct S3 environment variable names
-rw-r--r--doc/special_remotes/S3.mdwn4
-rw-r--r--doc/tips/using_Amazon_S3.mdwn4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn
index d4d3d0238..f34b078ae 100644
--- a/doc/special_remotes/S3.mdwn
+++ b/doc/special_remotes/S3.mdwn
@@ -6,8 +6,8 @@ See [[tips/using_Amazon_S3]] and
## configuration
-The standard environment variables `ANNEX_S3_ACCESS_KEY_ID` and
-`ANNEX_S3_SECRET_ACCESS_KEY` are used to supply login credentials
+The standard environment variables `AWS_S3_ACCESS_KEY_ID` and
+`AWS_S3_SECRET_ACCESS_KEY` are used to supply login credentials
for Amazon. When encryption is enabled, they are stored in encrypted form
by `git annex initremote`, so you do not need to keep the environment
variables set after the initial initalization of the remote.
diff --git a/doc/tips/using_Amazon_S3.mdwn b/doc/tips/using_Amazon_S3.mdwn
index b59ca9b4f..d941a19f0 100644
--- a/doc/tips/using_Amazon_S3.mdwn
+++ b/doc/tips/using_Amazon_S3.mdwn
@@ -4,8 +4,8 @@ Amazon S3, and use git-annex to transfer files into the cloud.
First, export your S3 credentials:
- # export ANNEX_S3_ACCESS_KEY_ID="08TJMT99S3511WOZEP91"
- # export ANNEX_S3_SECRET_ACCESS_KEY="s3kr1t"
+ # export AWS_S3_ACCESS_KEY_ID="08TJMT99S3511WOZEP91"
+ # export AWS_S3_SECRET_ACCESS_KEY="s3kr1t"
Now, create a gpg key, if you don't already have one. This will be used
to encrypt everything stored in S3, for your privacy. Once you have