Merge branch 'master' of ssh://git-annex.branchable.com

1 files changed, 7 insertions, 7 deletions

diff --git a/doc/tips/flickrannex.mdwn b/doc/tips/flickrannex.mdwn
index c90815065..fc914f283 100644
--- a/doc/tips/flickrannex.mdwn
+++ b/doc/tips/flickrannex.mdwn
@@ -20,20 +20,20 @@ This should make a ~/flickrannex folder
 
 ## Setup
 
-Run the program once to make an empty config file
+Run the program once to set it up. 
 
     cd ~/flickrannex; python2 flickrannex.py
 
-Edit the flickrannex.conf file. Add your flickrusername, password and folder(set) name.
+After the setup has finished, it will print the git-annex configure lines.
 
-## Configuring git-annex
+## Notes
 
-    git config annex.flickr-hook '/usr/bin/python2 ~/flickrannex/flickrannex.py'
-    git annex initremote flickr type=hook hooktype=flickr encryption=shared
-    git annex describe flickr "the flickr library"
+### Unencrypted mode
+The photo name on flickr is currently the GPGHMACSHA1 version.
 
-## Notes
+The real name of the picture will be in the description.
 
+### Encrypted mode
 The current version base64 encodes all the data, which results in ~35% larger filesize.
 
 I might look into yyenc instead. I'm not sure if it will work in the tEXt field.