From 76b1e2fd5a617e3983475fb51344beb5c5a467f1 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
 <develop@web>
Date: Wed, 22 May 2013 21:27:30 +0000
Subject: [PATCH 1/3]

---
 doc/tips/flickrannex.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/tips/flickrannex.mdwn b/doc/tips/flickrannex.mdwn
index c908150656..a807fed56b 100644
--- a/doc/tips/flickrannex.mdwn
+++ b/doc/tips/flickrannex.mdwn
@@ -20,12 +20,10 @@ 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.
-
 ## Configuring git-annex
 
     git config annex.flickr-hook '/usr/bin/python2 ~/flickrannex/flickrannex.py'

From a6719cf3f20190284fc0f824d909d9bca3130deb Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
 <develop@web>
Date: Wed, 22 May 2013 22:33:29 +0000
Subject: [PATCH 2/3]

---
 doc/tips/flickrannex.mdwn | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/tips/flickrannex.mdwn b/doc/tips/flickrannex.mdwn
index a807fed56b..269346eab0 100644
--- a/doc/tips/flickrannex.mdwn
+++ b/doc/tips/flickrannex.mdwn
@@ -20,18 +20,20 @@ This should make a ~/flickrannex folder
 
 ## Setup
 
-Run the program once to set it up.
+Run the program once to set it up. 
 
     cd ~/flickrannex; python2 flickrannex.py
 
-## Configuring git-annex
-
-    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"
+After the setup has finished, it will print the git-annex configure lines.
 
 ## Notes
 
+### Unencrypted mode
+The photo name on flickr is currently the GPGHMACSHA1 version.
+
+The real name of the pictures and/or videos 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.

From fd7aa29fdcd5c4bfeac455b7fb960df3e6767115 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
 <develop@web>
Date: Wed, 22 May 2013 22:53:22 +0000
Subject: [PATCH 3/3]

---
 doc/tips/flickrannex.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/flickrannex.mdwn b/doc/tips/flickrannex.mdwn
index 269346eab0..fc914f2832 100644
--- a/doc/tips/flickrannex.mdwn
+++ b/doc/tips/flickrannex.mdwn
@@ -31,7 +31,7 @@ After the setup has finished, it will print the git-annex configure lines.
 ### Unencrypted mode
 The photo name on flickr is currently the GPGHMACSHA1 version.
 
-The real name of the pictures and/or videos will be in the description.
+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.