mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

reword again

Browse source 
On second thought, "unlocking" is confusable with git-annex unlock.
This commit is contained in:
Joey Hess 2011-04-17 12:36:12 -04:00
parent 416c5e38e7
commit dd207994bc
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Remote/Encryptable.hs
View file

@ -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

20
doc/walkthrough/using_Amazon_S3.mdwn
View file

@ -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.