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

16 files changed, 306 insertions, 5 deletions

diff --git a/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment b/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment
new file mode 100644
index 000000000..597a1a195
--- /dev/null
+++ b/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w"
+ nickname="Alexander"
+ subject="standalone app dmg won't open in OSX 10.8.3"
+ date="2013-04-29T18:05:54Z"
+ content="""
+I downloaded the app build from [http://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/](http://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/) and unpacked it, but the .dmg won't open. I can run other dmg's successfully. 
+
+Trying to install git-annex via cabal on the same machine led to this issue: [http://git-annex.branchable.com/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/#comment-7cc94df1bf9a75a6d03369f3897d6816](http://git-annex.branchable.com/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/#comment-7cc94df1bf9a75a6d03369f3897d6816)
+"""]]
diff --git a/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn b/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn
new file mode 100644
index 000000000..73c2b3f0c
--- /dev/null
+++ b/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn
@@ -0,0 +1,54 @@
+### Please describe the problem.
+
+I seem to be unable to switch back and forth between git annex direct and git annex indirect mode in one of my repositories.  I can in others just fine.
+
+### What steps will reproduce the problem?
+
+In the broken repository I can do:
+
+    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ git annex direct
+    commit  
+    add audio/part2.aup (checksum...) ok
+    ok
+    add images/campaign.png (checksum...) ok
+    ok
+    add images/transifex.png (checksum...) ok
+    ok
+    add script-lines.txt (checksum...) ok
+    ok
+    add vid_pitch.blend (checksum...) ok
+    ok
+    (Recording state in git...)
+    [master 9f13dc0] commit before switching to direct mode
+     1 file changed, 145 insertions(+), 1 deletion(-)
+     rewrite audio/part2.aup (100%)
+     mode change 120000 => 100644
+    ok
+    direct gavroche-vid-shot.blend 
+    git-annex: /home/cwebber/gfx-proj/mediagoblin_vid/.git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f: rename: permission denied (Permission denied)
+    failed
+    git-annex: direct: 1 failed
+
+looking at the files:
+
+    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ ls -l gavroche-vid-shot.blend
+    lrwxrwxrwx 1 cwebber cwebber 190 Apr 28 18:27 gavroche-vid-shot.blend -> .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
+    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ ls -l .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
+    -rw-r--r-- 1 cwebber cwebber 2935980 Apr 28 18:27 .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
+    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$
+
+... it looks like these permissions should be fine!
+
+Some notable things:
+
+* I believe Blender wrote directly to a file that was in "locked" somehow, despite it being in that state.  It may have actually followed the symlink and overwritten that file, I'm not sure.
+* However, the file that git-annex is now reporting with "permission denied" is not the one it did previously... I did git checkout -- on all the files, switched them over, and it's a different set of broken things now!
+* It's actually easy enough to fix... in fact, I did fix it!  I just did a fresh clone of the git repository and a git annex get and everything is fine now.  However, it seemed like possibly a bug that might hit other people, hence my reporting it.
+
+### What version of git-annex are you using? On what operating system?
+
+git annex version 4.20130417 on debian wheezy
+
+### Please provide any additional information below.
+
+
diff --git a/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_1_4585b251f011a153c62f377c324cf963._comment b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_1_4585b251f011a153c62f377c324cf963._comment
new file mode 100644
index 000000000..6ba0111a7
--- /dev/null
+++ b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_1_4585b251f011a153c62f377c324cf963._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
+ nickname="Andrew"
+ subject="comment 1"
+ date="2013-04-30T02:31:31Z"
+ content="""
+I've had the same thing happen in reverse. I can not switch from direct to indirect mode. After receiving a similar error:
+
+    git-annex: /Users/akraut/Desktop/annexes/home/.git/annex/objects/ZV/kq/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3.cache: removeLink: permission denied (Permission denied)
+    failed
+    git-annex: indirect: 1 failed
+    
+    %  > ls -la /Users/akraut/Desktop/annexes/home/.git/annex/objects/ZV/kq/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3.cache
+    -rw-r--r-- 1 akraut staff 23 Mar 23 21:10 /Users/akraut/Desktop/annexes/home/.git/annex/objects/ZV/kq/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3/SHA256E-s207--4b4fa180ac4c16fe83eb2a5fed4c217c1d26195c876a4e0e700ae63605348d75.mp3.cache
+
+After this error, annex things I'm in indirect mode:
+
+    %  > git annex status
+    supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
+    supported remote types: git S3 bup directory rsync web webdav glacier hook
+    repository mode: indirect
+
+And git things that my repo has many uncommitted typechanges.
+"""]]
diff --git a/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_2_b49725488c3db5e00ede7b65ed9d62fa._comment b/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_2_b49725488c3db5e00ede7b65ed9d62fa._comment
new file mode 100644
index 000000000..46a488c20
--- /dev/null
+++ b/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_2_b49725488c3db5e00ede7b65ed9d62fa._comment
@@ -0,0 +1,110 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~maestro-alubia"
+ nickname="maestro-alubia"
+ subject="comment 2"
+ date="2013-04-29T21:04:30Z"
+ content="""
+Thanks for explaining the error message.
+
+I did some investigation but I am not really understanding what is going on.
+
+But step by step, lets take a file without any confusing characters in filename (e.g. '/'), so we use the file \".directory\".
+
+1.) I run on the client:
+[[!format sh \"\"\"
+fabian@fabian-thinkpad /mnt/data-common/Audio $ ls -la .directory 
+lrwxrwxrwx 1 fabian fabian 180 25. Apr 17:15 .directory -> .git/annex/objects/Ff/m9/SHA256E-s91--378daa8e2a232ae5a04d9f6c83003d8ccfe6c8b7547c1789a130ba94017283ed/SHA256E-s91--378daa8e2a232ae5a04d9f6c83003d8ccfe6c8b7547c1789a130ba94017283ed
+fabian@fabian-thinkpad /mnt/data-common/Audio $ basename $(git cat-file -p \"HEAD:.directory\")
+SHA256E-s91--378daa8e2a232ae5a04d9f6c83003d8ccfe6c8b7547c1789a130ba94017283ed
+\"\"\"]]
+
+2.) I run on the server:
+
+[[!format sh \"\"\"
+fabian@eifel:/mnt/raid/Audio$ ls -la .directory 
+-rw----r-x 1 fabian fabian 91 Dez 13 17:35 .directory
+fabian@eifel:/mnt/raid/Audio$ basename $(git cat-file -p \"HEAD:.directory\")
+SHA256E-s91--378daa8e2a232ae5a04d9f6c83003d8ccfe6c8b7547c1789a130ba94017283ed
+fabian@eifel:/mnt/raid/Audio$ git-annex fsck .directory 
+fsck .directory (checksum...) ok
+\"\"\"]]
+
+So obviously the file is present on the server (it is using direct mode).
+
+3.) On the client again:
+
+[[!format sh \"\"\"
+fabian@fabian-thinkpad /mnt/data-common/Audio $ git-annex get .directory 
+get .directory (from eifel.fritz.box__mnt_raid_Audio...) 
+  requested key is not present
+rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
+rsync error: error in rsync protocol data stream (code 12) at io.c(605) [Receiver=3.0.9]
+
+  Unable to access these remotes: eifel.fritz.box__mnt_raid_Audio
+
+  Try making some of these repositories available:
+  	efe13d8c-2b02-455f-9874-b7043caa332f -- eifel.fritz.box__mnt_raid_Audio (fabian@eifel:/mnt/raid/Audio)
+failed
+git-annex: get: 1 failed
+fsck .directory (checking eifel.fritz.box__mnt_raid_Audio...) (fixing location log) 
+  ** Based on the location log, .directory
+  ** was expected to be present, but its content is missing.
+
+  ** No known copies exist of .directory
+failed
+(Recording state in git...)
+git-annex: fsck: 1 failed
+fabian@fabian-thinkpad /mnt/data-common/Audio $ git-annex get .directory 
+get .directory (not available) 
+  No other repository is known to contain the file.
+failed
+git-annex: get: 1 failed
+\"\"\"]]
+
+Also running \"git annex sync\" on both sides does not help.
+
+This is the configuration:
+
+Client:
+[[!format sh \"\"\"
+fabian@fabian-thinkpad /mnt/data-common/Audio $ cat .git/config 
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[annex]
+	uuid = a1f816fe-3fce-4887-a85c-b7b9e501a5d7
+	version = 3
+[remote \"eifel.fritz.box__mnt_raid_Audio\"]
+	url = ssh://fabian@git-annex-eifel.fritz.box-fabian_mntraidAudio/mnt/raid/Audio/
+	fetch = +refs/heads/*:refs/remotes/eifel.fritz.box__mnt_raid_Audio/*
+	annex-uuid = efe13d8c-2b02-455f-9874-b7043caa332f
+	annex-cost = 175.0
+\"\"\"]]
+
+Server:
+[[!format sh \"\"\"
+fabian@eifel:/mnt/raid/Audio$ cat .git/config 
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[annex]
+	uuid = efe13d8c-2b02-455f-9874-b7043caa332f
+	version = 3
+	direct = true
+[gc]
+	auto = 0
+[remote \"fabianthinkpad.fritz.box__mnt_datacommon_Audio\"]
+	url = ssh://fabian@git-annex-fabian-thinkpad.fritz.box-fabian_mntdatacommonAudio/mnt/data-common/Audio/
+	fetch = +refs/heads/*:refs/remotes/fabianthinkpad.fritz.box__mnt_datacommon_Audio/*
+	annex-uuid = a1f816fe-3fce-4887-a85c-b7b9e501a5d7
+	annex-cost = 175.0
+\"\"\"]]
+
+Please let me know if you need more information.
+
+Btw: I sent some money to my flattr account so I can support you soon. Thanks again for your work!
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_10_51097a6b84edcc607abc0e6e21ca21f2._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_10_51097a6b84edcc607abc0e6e21ca21f2._comment
new file mode 100644
index 000000000..3e4e39e24
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_10_51097a6b84edcc607abc0e6e21ca21f2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 10"
+ date="2013-04-28T18:12:30Z"
+ content="""
+oh, but to answer your earlier question,  \"(archive + smallarchive >= numcopies)\" would be exactly what I needed to get the behavior I want and have the others be archive directories.
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_6_b068924802f3917e3e005350cb0cc2a2._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_6_b068924802f3917e3e005350cb0cc2a2._comment
new file mode 100644
index 000000000..c48e8c429
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_6_b068924802f3917e3e005350cb0cc2a2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 6"
+ date="2013-04-27T21:44:19Z"
+ content="""
+I *think* that'd work... the only thing would be that the SSH remote wouldn't get any files that *weren't* in archive directories, right?  They'd migrate from the client to the backup to satisfy numcopies, and that would be it, two copies and we're done.  Since it's not in an archive directory, the ssh remote doesn't want it.
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_7_f4772858c927d4a62edc3caf59b5da10._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_7_f4772858c927d4a62edc3caf59b5da10._comment
new file mode 100644
index 000000000..709305098
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_7_f4772858c927d4a62edc3caf59b5da10._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 7"
+ date="2013-04-27T21:56:24Z"
+ content="""
+Nope, you're thinking of smallarchive. archive wants files in any directory. Should work.
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_8_d0923d2950357f4444c5ef94ff196ba3._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_8_d0923d2950357f4444c5ef94ff196ba3._comment
new file mode 100644
index 000000000..b0211e106
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_8_d0923d2950357f4444c5ef94ff196ba3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 8"
+ date="2013-04-28T05:59:53Z"
+ content="""
+Just set it up that way.  Looking good so far!  I'll check in again later when I'm sure things are better.
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_9_7fb30cb80aecc60e48c64846aa185206._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_9_7fb30cb80aecc60e48c64846aa185206._comment
new file mode 100644
index 000000000..26b903823
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_9_7fb30cb80aecc60e48c64846aa185206._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 9"
+ date="2013-04-28T17:01:29Z"
+ content="""
+Yeah that did it.  Thanks!  I'm not sure why I wasn't using Archive all along!
+
+"""]]
diff --git a/doc/bugs/xmpp_needs_one_account_per_distinct_repository/comment_1_820732c4dcb15186b4f635c50fdb0805._comment b/doc/bugs/xmpp_needs_one_account_per_distinct_repository/comment_1_820732c4dcb15186b4f635c50fdb0805._comment
new file mode 100644
index 000000000..eec708362
--- /dev/null
+++ b/doc/bugs/xmpp_needs_one_account_per_distinct_repository/comment_1_820732c4dcb15186b4f635c50fdb0805._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="fmarier"
+ ip="121.98.93.240"
+ subject="My current XMPP setup"
+ date="2013-04-28T22:16:50Z"
+ content="""
+Here's the way I currently use XMPP (Google Talk) on my devices:
+
+* I have a separate XMPP/Google account on each device (device1@gmail.com, device2@gmail.com, etc.). I keep them separate to protect the credentials of the other devices in case I lose one of the devices.
+* I setup git-annex to sync with a \"friend\" and have device1@gmail.com and device2@gmail.com sync with each other.
+
+I have three different repositories I'd like to manage with git-annex assistant:
+
+ * R1: things I want everywhere
+ * R2: things I only want on personal laptop and desktop
+ * R3: things I only want on personal and work laptops
+
+So it would be great if there was a way to easily keep things separate.
+"""]]
diff --git a/doc/design/assistant/blog/day_250__stymied.mdwn b/doc/design/assistant/blog/day_250__stymied.mdwn
index e2b38af95..f9d50b48c 100644
--- a/doc/design/assistant/blog/day_250__stymied.mdwn
+++ b/doc/design/assistant/blog/day_250__stymied.mdwn
@@ -10,7 +10,7 @@ Instead, today I worked on making the webapp require less redundant
 password entry when adding multiple repositories using the same cloud
 provider. This is especially needed for the Internet Archive, since users
 will often want to have quite a few repositories, for different IA items.
-Implemented it for for box.com, and Amazon too.
+Implemented it for box.com, and Amazon too.
 
 Francois Marier has built an Ubuntu PPA for git-annex, containing the
 current version, with the assistant and webapp. It's targeted at Precise,
diff --git a/doc/design/assistant/blog/day_250__stymied/comment_1_330a10d447ccc3db03fcbfe571dbb404._comment b/doc/design/assistant/blog/day_250__stymied/comment_1_330a10d447ccc3db03fcbfe571dbb404._comment
new file mode 100644
index 000000000..26c7d7c7f
--- /dev/null
+++ b/doc/design/assistant/blog/day_250__stymied/comment_1_330a10d447ccc3db03fcbfe571dbb404._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw"
+ nickname="Mark"
+ subject="Thanks!"
+ date="2013-04-29T01:24:55Z"
+ content="""
+I was not looking forward to figuring out how to come up with all of those haskell build deps on Precise, so thanks to François Marier for putting this together.  (Does Ubuntu/launchpad autobuild all of the architectures, or do they need to be contributed? I see that `armhf` isn't there at the moment...)
+"""]]
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
index a48b44106..1e4cd90e1 100644
--- a/doc/design/assistant/polls/Android_default_directory.mdwn
+++ b/doc/design/assistant/polls/Android_default_directory.mdwn
@@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
 want the first time they run it, but to save typing on android, anything
 that gets enough votes will be included in a list of choices as well.
 
-[[!poll open=yes expandable=yes 41 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
+[[!poll open=yes expandable=yes 42 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_4_1d8025aabe8bc72711a77f691f67da5f._comment b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_4_1d8025aabe8bc72711a77f691f67da5f._comment
new file mode 100644
index 000000000..4c050f052
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_4_1d8025aabe8bc72711a77f691f67da5f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="fmarier"
+ ip="121.98.93.240"
+ subject="My PPA (Ubuntu Precise) has git-annex 4.20130417"
+ date="2013-04-27T23:31:54Z"
+ content="""
+It has the 90+ Haskell packages that are required to build git annex with every backend: https://launchpad.net/~fmarier/+archive/ppa
+"""]]
diff --git a/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/comment_1_835a3608df3e9d044cabe822d0f3e7e4._comment b/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/comment_1_835a3608df3e9d044cabe822d0f3e7e4._comment
new file mode 100644
index 000000000..55cf0b97b
--- /dev/null
+++ b/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/comment_1_835a3608df3e9d044cabe822d0f3e7e4._comment
@@ -0,0 +1,27 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w"
+ nickname="Alexander"
+ subject="can't install git-annex on OS X Mountain Lion without disabling WebDAV support"
+ date="2013-04-29T17:57:03Z"
+ content="""
+possibly related to this Debian issue:
+
+trying to install git-annex with cabal on OS X 10.8.3, the build fails with
+
+
+    Loading package DAV-0.4 ... linking ... ghc: 
+    lookupSymbol failed in relocateSection (relocate external)
+    ~/.cabal/lib/DAV-0.4/ghc-7.4.2/HSDAV-0.4.o: unknown symbol `_DAVzm0zi4_PathszuDAV_version1_closure'
+    ghc: unable to load package `DAV-0.4'
+    Failed to install git-annex-4.20130417
+    cabal: Error: some packages failed to install:
+    git-annex-4.20130417 failed during the building phase. The exception was:
+    ExitFailure 1
+
+
+This was after following all of the instructions for the Homebrew install at [http://git-annex.branchable.com/install/OSX/](http://git-annex.branchable.com/install/OSX/)
+I was able to work around this issue by installing with the WebDAV flag disabled (ie, added the option --flags=\"-WebDAV\" to last command in the OS X install instructions):
+
+    cabal install git-annex --bindir=$HOME/bin --flags=\"-WebDAV\"
+
+"""]]
diff --git a/doc/users/fmarier.mdwn b/doc/users/fmarier.mdwn
index ecf342697..d04b6968d 100644
--- a/doc/users/fmarier.mdwn
+++ b/doc/users/fmarier.mdwn
@@ -1,6 +1,6 @@
 # François Marier
 
-Free Software and Debian Developer. Lead developer of [Libravatar](http://www.libravatar.org)
+Free Software and Debian Developer. Lead developer of [Libravatar](https://www.libravatar.org)
 
-* [Blog](http://feeding.cloud.geek.nz)
-* [Identica](http://identi.ca/fmarier) / [Twitter](http://twitter.com/fmarier)
+* [Blog](http://feeding.cloud.geek.nz) and [homepage](http://fmarier.org)
+* [Identica](http://identi.ca/fmarier) / [Twitter](https://twitter.com/fmarier)