From dd207994bc8026f22bb366e654a3945d5e995f87 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 17 Apr 2011 12:36:12 -0400
Subject: reword again

On second thought, "unlocking" is confusable with git-annex unlock.
---
 Remote/Encryptable.hs                |  2 +-
 doc/walkthrough/using_Amazon_S3.mdwn | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Remote/Encryptable.hs b/Remote/Encryptable.hs
index 9e4f58ed4..11df2673c 100644
--- a/Remote/Encryptable.hs
+++ b/Remote/Encryptable.hs
@@ -81,7 +81,7 @@ cipherKey (Just c) k = do
 		Nothing -> case extractCipher c of
 			Nothing -> return Nothing
 			Just encipher -> do
-				showNote "unlocking"
+				showNote "gpg"
 				cipher <- liftIO $ decryptCipher c encipher
 				Annex.changeState (\s -> s { Annex.cipher = Just cipher })
 				ret cipher
diff --git a/doc/walkthrough/using_Amazon_S3.mdwn b/doc/walkthrough/using_Amazon_S3.mdwn
index 0a13900b8..a0ce951a8 100644
--- a/doc/walkthrough/using_Amazon_S3.mdwn
+++ b/doc/walkthrough/using_Amazon_S3.mdwn
@@ -14,24 +14,24 @@ like "2512E3C7"
 
 Next, create the S3 remote, and describe it. 
 
-	# git annex initremote mys3 type=S3 encryption=2512E3C7
-	initremote mys3 (checking bucket) (creating bucket in US) ok
-	# git annex describe mys3 "at Amazon's US datacenter"
-	describe mys3 ok
+	# git annex initremote cloud type=S3 encryption=2512E3C7
+	initremote cloud (checking bucket) (creating bucket in US) ok
+	# git annex describe cloud "at Amazon's US datacenter"
+	describe cloud ok
 
 The configuration for the S3 remote is stored in git. So to make another
 repository use the same S3 remote is easy:
 
 	# cd /media/usb/annex
         # git pull laptop master
-	# git annex initremote mys3
-	initremote mys3 (checking bucket) ok
+	# git annex initremote cloud
+	initremote cloud (checking bucket) ok
 
 Now the remote can be used like any other remote.
 
-	# git annex copy my_cool_big_file --to mys3
-	copy my_cool_big_file (unlocking) (checking mys3...) (to mys3...) ok
-	# git annex move video/hackity_hack_and_kaxxt.mov --to mys3
-	move video/hackity_hack_and_kaxxt.mov (unlocking) (checking mys3...) (to mys3...) ok
+	# git annex copy my_cool_big_file --to cloud
+	copy my_cool_big_file (gpg) (checking cloud...) (to cloud...) ok
+	# git annex move video/hackity_hack_and_kaxxt.mov --to cloud
+	move video/hackity_hack_and_kaxxt.mov (gpg) (checking cloud...) (to cloud...) ok
 
 See [[special_remotes/Amazon_S3]] for details.
-- 
cgit v1.2.3