diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-17 11:31:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-17 11:31:56 -0400 |
| commit | f486768b169ec392448af75dc3a5f90de9d5a353 (patch) | |
| tree | 493bb6c9a43bedf420ec86ce7d58955f5e4c2501 | |
| parent | 83423211a21d061b4f0d62c925dae7aa4cc62f98 (diff) | |
tweak wording
| -rw-r--r-- | Remote/Encryptable.hs | 2 | ||||
| -rw-r--r-- | doc/walkthrough/using_Amazon_S3.mdwn | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Encryptable.hs b/Remote/Encryptable.hs index aa7c2a569..9e4f58ed4 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 "getting encryption key" + showNote "unlocking" 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 7f84f2ac2..0a13900b8 100644 --- a/doc/walkthrough/using_Amazon_S3.mdwn +++ b/doc/walkthrough/using_Amazon_S3.mdwn @@ -30,8 +30,8 @@ repository use the same S3 remote is easy: Now the remote can be used like any other remote. # git annex copy my_cool_big_file --to mys3 - copy my_cool_big_file (to mys3...) ok + 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 (to mys3...) ok + move video/hackity_hack_and_kaxxt.mov (unlocking) (checking mys3...) (to mys3...) ok See [[special_remotes/Amazon_S3]] for details. |