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

25 files changed, 511 insertions, 1 deletions

diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_10_5072de8fcca9fe70bc235ea8c8ee2877._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_10_5072de8fcca9fe70bc235ea8c8ee2877._comment
new file mode 100644
index 000000000..5e2839db2
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_10_5072de8fcca9fe70bc235ea8c8ee2877._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 10"
+ date="2013-07-21T03:58:35Z"
+ content="""
+Upstream bug report: <http://bugs.debian.org/717463>
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_1_307df11b5bcf289d7999e1e7f7c461c9._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_1_307df11b5bcf289d7999e1e7f7c461c9._comment
new file mode 100644
index 000000000..1ad583ec7
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_1_307df11b5bcf289d7999e1e7f7c461c9._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 1"
+ date="2013-07-21T01:20:32Z"
+ content="""
+I've fixed the gmail.com problem. It was trying all the servers returned by the SRV query, which all failed due to the bad password, and then fell back to trying gmail.com directly. For whatever reason, gmail.com will accept XMPP connections, but never responds to traffic, so it hung.
+
+The hang with your own XMPP server does not seem related to that.
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_2_f24378cf30a7d32594da90749fabec3c._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_2_f24378cf30a7d32594da90749fabec3c._comment
new file mode 100644
index 000000000..39c69b5ea
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_2_f24378cf30a7d32594da90749fabec3c._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 2"
+ date="2013-07-21T01:26:49Z"
+ content="""
+It seems to start to connect to db48x.net, and hang. It may be failing to parse the response about the password being bad, or something like that, and be sitting around waiting for a response. I'm not sure.
+
+What XMPP server software are you using?
+
+The next step would probably be to get a tcpdump of the XMPP connection, ideally with SSL disabled. (Assuming the hang is not occuring during the SSL setup.)
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_3_4b07093be844ac62b611cee1dfde5aa7._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_3_4b07093be844ac62b611cee1dfde5aa7._comment
new file mode 100644
index 000000000..b396e97a1
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_3_4b07093be844ac62b611cee1dfde5aa7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
+ nickname="Daniel"
+ subject="comment 3"
+ date="2013-07-21T02:26:38Z"
+ content="""
+I captured the connection attempt; the trace is at <http://db48x.net/temp/annex-xmpp-connection.pcap.gz>
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_4_fe1ed152a485c4aebfa9b9f300101835._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_4_fe1ed152a485c4aebfa9b9f300101835._comment
new file mode 100644
index 000000000..89c66d173
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_4_fe1ed152a485c4aebfa9b9f300101835._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
+ nickname="Daniel"
+ subject="comment 4"
+ date="2013-07-21T02:45:52Z"
+ content="""
+Comparing that to when I connect to gmail, I see that my server isn't sending any stream features; my server doesn't support TLS.
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_5_2d311f520aee04287df6bddfd8535734._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_5_2d311f520aee04287df6bddfd8535734._comment
new file mode 100644
index 000000000..62e038941
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_5_2d311f520aee04287df6bddfd8535734._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 5"
+ date="2013-07-21T02:55:36Z"
+ content="""
+Great. We can see git-annex opens the XMPP stream tag, and your server responds by opening its own tag.
+
+Compare with this similar conversation:
+
+    joey@gnu:~>telnet kite 5222
+    Trying 80.68.85.49...
+    Connected to wren.kitenet.net.
+    Escape character is '^]'.
+    <?xml version='1.0'?>
+    <stream:stream xmlns=\"jabber:client\" to=\"kitenet.net\" version=\"1.0\"   xmlns:stream=\"http://etherx.jabber.org/streams\">
+    <?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'   id='e7d73883-a362-4923-89f8-0531eb9d16a0' from='kitenet.net' version='1.0' xml:lang='en'><stream:features>   
+
+So far it's the same as the conversation with your server, but now my server goes on to send another line:
+
+    <stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>  <mechanism>SCRAM-SHA-1</mechanism><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features>
+
+While your server does not send anything. 
+
+I see that my XMPP client library expects to receive a features tag at this point. Until it does, it won't continue. It may be that your server is not sending the features because it does not implement TLS or any of the other features that need to be advertised.
+
+I think I need to report this to the author of the XMPP client library. It would help to know what XMPP server software you're using, and if it has TLS support enabled.
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_6_d9f916f012184738446c5996ee9d2270._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_6_d9f916f012184738446c5996ee9d2270._comment
new file mode 100644
index 000000000..5bcc63d20
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_6_d9f916f012184738446c5996ee9d2270._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 6"
+ date="2013-07-21T03:07:41Z"
+ content="""
+If the initiating entity includes in the initial stream header the 'version' attribute set to a value of at least \"1.0\" (see Section 4.7.5), after sending the response stream header the receiving entity MUST send a <features/> child element 
+
+-- <http://xmpp.org/rfcs/rfc6120.html#streams-negotiation>\"
+
+By my reading this XMPP server is not RFC compliant. It's not clear to me if there's a good way for the XMPP client
+to cater to XMPP servers that neglect to send at least an empty features tag.
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_7_0b5f9350e2367301241c7668a15815ef._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_7_0b5f9350e2367301241c7668a15815ef._comment
new file mode 100644
index 000000000..bcb47e20a
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_7_0b5f9350e2367301241c7668a15815ef._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
+ nickname="Daniel"
+ subject="comment 7"
+ date="2013-07-21T03:08:52Z"
+ content="""
+My server doesn't support TLS at all, and I don't really know what software it is (It's just a freebie that comes with the webhosting for the domain, I don't actually administer it myself). I'll try to find out, perhaps it's something an upgrade can fix.
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_8_f00b6ae154004e405f0bd23b7359962e._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_8_f00b6ae154004e405f0bd23b7359962e._comment
new file mode 100644
index 000000000..06311fb13
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_8_f00b6ae154004e405f0bd23b7359962e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
+ nickname="Daniel"
+ subject="comment 8"
+ date="2013-07-21T03:10:25Z"
+ content="""
+Oh, and I agree with your reading of the spec; I was just looking that up myself. I will point out that most other software apparently treats a missing features tag as if it were an empty one, so it's certainly doable :)
+"""]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server/comment_9_41b86468013da15f46be29da520afa10._comment b/doc/bugs/cannot_connect_to_xmpp_server/comment_9_41b86468013da15f46be29da520afa10._comment
new file mode 100644
index 000000000..67bec739e
--- /dev/null
+++ b/doc/bugs/cannot_connect_to_xmpp_server/comment_9_41b86468013da15f46be29da520afa10._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA"
+ nickname="Daniel"
+ subject="comment 9"
+ date="2013-07-21T03:24:03Z"
+ content="""
+It's jabberd 1.4.3. Unfortunately the jabberd14 webpage is rather broken; I can't get to the bugzilla or even the svn or downloads page so I don't know if this is a known bug, something that's been fixed in a newer version, or anything.
+"""]]
diff --git a/doc/bugs/git_annex_add_removes_file_with_no_data_left/comment_12_06d517ac4ef8def4629a40d7c3549bac._comment b/doc/bugs/git_annex_add_removes_file_with_no_data_left/comment_12_06d517ac4ef8def4629a40d7c3549bac._comment
new file mode 100644
index 000000000..30a6526f0
--- /dev/null
+++ b/doc/bugs/git_annex_add_removes_file_with_no_data_left/comment_12_06d517ac4ef8def4629a40d7c3549bac._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="andy"
+ ip="108.202.17.204"
+ subject="comment 12"
+ date="2013-07-21T04:47:33Z"
+ content="""
+Thanks! Works great!
+"""]]
diff --git a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
new file mode 100644
index 000000000..2eaebe290
--- /dev/null
+++ b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
@@ -0,0 +1,76 @@
+### Please describe the problem.
+when attempting to create a glacier special remote one of the gpg sub-commands hangs without returning.
+
+### What steps will reproduce the problem?
+I'm not sure what will reproduce this issue. I recently upgraded from the apt-get version of git-annex (version 3) to the cabal version (version 4 shown below), but I'm not sure if that is relevant at all).
+
+### What version of git-annex are you using? On what operating system?
+
+git version: 1.7.9.5
+
+(git annex was installed using cabal)
+[[!format sh """
+$> git-annex version
+git-annex version: 4.20130709
+build flags: Testsuite S3 Inotify DBus
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 4
+upgrade supported from repository versions: 0 1 2
+"""]]
+
+OS version:
+
+12.04.2 LTS, Precise Pangolin
+
+GPG version:
+
+[[!format sh """
+$> gpg --version
+gpg (GnuPG) 1.4.11
+Copyright (C) 2010 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Home: ~/.gnupg
+Supported algorithms:
+Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
+Cipher: 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH, CAMELLIA128,
+        CAMELLIA192, CAMELLIA256
+Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
+Compression: Uncompressed, ZIP, ZLIB, BZIP2
+"""]]
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+$> git annex initremote glacier type=glacier encryption=annex-l1@ggg.local embedcreds=yes vault=some-vault-name --verbose --debug
+[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","show-ref","git-annex"]
+[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","show-ref","--hash","refs/heads/git-annex"]
+[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..181aa86dfd264557ab73285220d70c67f868b349","--oneline","-n1"]
+[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..1dc6e1c4bca2102fc25e86491ab89338750ee1f6","--oneline","-n1"]
+[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..b919b83cafeff420d23af24ff7de35b4ff955c8c","--oneline","-n1"]
+[2013-07-20 22:45:13 MDT] chat: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","cat-file","--batch"]
+[2013-07-20 22:45:13 MDT] read: git ["config","--null","--list"]
+initremote glacier (encryption setup) [2013-07-20 22:45:13 MDT] read: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--with-colons","--list-public-keys","annex-l1@ggg.local"]
+[2013-07-20 22:45:13 MDT] read: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--gen-random","--armor","2","512"]
+[2013-07-20 22:47:37 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--encrypt","--no-encrypt-to","--no-default-recipient","--recipient","DF31708872834ABA"]
+(with gpg key DF31708872834ABA) [2013-07-20 22:47:37 MDT] call: glacier ["--region=us-east-1","vault","create","some-vault-name"]
+[2013-07-20 22:47:38 MDT] call: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","config","remote.glacier.annex-glacier","true"]
+[2013-07-20 22:47:38 MDT] call: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","config","remote.glacier.annex-uuid","a9739087-7860-4ed0-bc38-0b6031b1afd3"]
+(gpg) [2013-07-20 22:47:38 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--decrypt"]
+[2013-07-20 22:47:38 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--batch","--passphrase-fd","3","--symmetric","--force-mdc"]
+#at this point it simply waits forever. not sure what it's waiting for, stdin maybe? maybe fd 3 is empty??
+
+#[on a different terminal]
+$> ps ax | grep gpg | grep -v ssh
+ 2024 ?        Ss     0:00 /usr/bin/gpg-agent --daemon --sh --write-env-file=/home/cantora/.gnupg/gpg-agent-info-ggg /usr/bin/dbus-launch --exit-with-session gnome-session --session=ubuntu
+ 8341 pts/4    SL+    0:00 gpg --batch --no-tty --use-agent --quiet --trust-model always --batch --passphrase-fd 3 --symmetric --force-mdc
+ 8652 pts/5    S+     0:00 grep --color=auto gpg
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/utf8.mdwn b/doc/bugs/utf8.mdwn
new file mode 100644
index 000000000..61640ec5f
--- /dev/null
+++ b/doc/bugs/utf8.mdwn
@@ -0,0 +1,187 @@
+### Please describe the problem.
+
+Git Annex stumbles and does not transfer files with special characters...
+
+
+### What steps will reproduce the problem?
+
+Added the file "Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3" to Git Annex on my Galaxy Nexus (Android), which was committed successfully but not gettable.
+
+
+### What version of git-annex are you using? On what operating system?
+
+Phone: 4.20130709-g339d1eo
+Transfer Server: 3.20120406 (which it did not get to)
+Desktop: 3.20120629
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+fozz@cobol:~/Phone $ git annex get
+get Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (not available) 
+  Try making some of these repositories available:
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+failed
+get Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueño_(Monsterrat's_Live_Takes).mp3 (not available) 
+  Try making some of these repositories available:
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+failed
+get Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (not available) 
+  Try making some of these repositories available:
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+failed
+get Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (not available) 
+  Try making some of these repositories available:
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+failed
+git-annex: get: 4 failed
+
+===============
+
+fozz@cobol:~/Phone $ git annex whereis Freddie_Mercury/
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (1 copy) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueño_(Monsterrat's_Live_Takes).mp3 (1 copy) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (1 copy) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (1 copy) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+whereis Freddie_Mercury/Barcelona_[+video]/B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3 (3 copies) 
+  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+ok
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment b/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment
new file mode 100644
index 000000000..0df4c2aa5
--- /dev/null
+++ b/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
+ nickname="Matthew"
+ subject="Renaming files"
+ date="2013-07-21T10:08:16Z"
+ content="""
+Renaming the files does not fix it, Git annex on all computers knows that those files are only in my phone, but the assistant is refusing to transfer the contents, it does not seem to know that it needs to...
+
+    whereis Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (3 copies) 
+      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+       	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+       	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+    ok
+    whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (1 copy) 
+      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+    ok
+    whereis Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (3 copies) 
+      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
+       	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
+       	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
+    ok
+
+"""]]
diff --git a/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment b/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment
new file mode 100644
index 000000000..ff2a5363d
--- /dev/null
+++ b/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
+ nickname="Matthew"
+ subject="git annex copy --to won't get them across either..."
+ date="2013-07-21T10:12:03Z"
+ content="""
+git annex copy . --to markdown.DOMAIN_phoneannex responds with
+
+    ControlPath \"/data/data/ga.androidterm/tmp/fozz@...somethingthatlookslikeahash\" too long for Unix domain socket
+"""]]
diff --git a/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment b/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment
new file mode 100644
index 000000000..ecdee070c
--- /dev/null
+++ b/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="seems to not involve utf8 at all.."
+ date="2013-07-21T18:17:00Z"
+ content="""
+Can you please show me the actual filename, that you obfuscated as \"/data/data/ga.androidterm/tmp/fozz@...somethingthatlookslikeahash\" ?
+"""]]
diff --git a/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment b/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment
new file mode 100644
index 000000000..12bf4c5a6
--- /dev/null
+++ b/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="GLITTAH"
+ ip="37.130.227.133"
+ subject="comment 4"
+ date="2013-07-21T19:36:16Z"
+ content="""
+This sounds like a bug I ran into a while ago that got fixed.
+
+>What version of git-annex are you using? On what operating system?
+>
+>Phone: 4.20130709-g339d1eo Transfer Server: 3.20120406 (which it did not get to) Desktop: 3.20120629
+
+Maybe try upgrading your server and desktop versions?  Those look old enough to still have the utf-8 bug.
+"""]]
diff --git a/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment b/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment
new file mode 100644
index 000000000..22ec33481
--- /dev/null
+++ b/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
+ nickname="Matthew"
+ subject="Darn it..."
+ date="2013-07-21T20:29:33Z"
+ content="""
+Hi,
+
+Sorry, it was on my phone and very long and I didn't think it'd be important... Sheesh Users eh!
+
+I think the error happened for every file or at least lots, not just the one with the strange tilde above the \"n\".
+Eventually, it might have been after a phone reboot, it sorted itself and continued.
+
+I can try and recreate it if it'll help, though it won't be till Wednesday / Thursday as I'm going away for a few days and I still need to pack.
+
+Sorry for the bad bug report, I know how annoying they are.
+
+It's not so easy for me to upgrade because one's an Ubuntu LTS and one is a Mint Debian Edition, both are the repository versions.
+"""]]
diff --git a/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment b/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment
new file mode 100644
index 000000000..bb97d0fa4
--- /dev/null
+++ b/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="develop"
+ subject="comment 6"
+ date="2013-07-21T20:31:50Z"
+ content="""
+As much i myself personally would hate it. You really should go with the standalone builds provided on this site then.
+
+Just download the zip, extract on both machines. Make sure the PATH is correct, and it should Just Work(TM)
+
+"""]]
diff --git a/doc/design/assistant/blog/day_300__new_logo/comment_1_9fc64e33863b9fce00f6a03417a91e36._comment b/doc/design/assistant/blog/day_300__new_logo/comment_1_9fc64e33863b9fce00f6a03417a91e36._comment
new file mode 100644
index 000000000..714fbc825
--- /dev/null
+++ b/doc/design/assistant/blog/day_300__new_logo/comment_1_9fc64e33863b9fce00f6a03417a91e36._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~mikapflueger"
+ nickname="mikapflueger"
+ subject="The dreaded &quot;ü&quot;"
+ date="2013-07-21T20:56:30Z"
+ content="""
+Yeah, with the last name of \"Pflüger\" I also usually find bugs having to do with the letter \"ü\". (-;
+I guess it is simply one of the more frequent german umlauts, especially in names (the classic \"Müller\", which is one of the most common last names in Germany). And apparently the German cabal strikes here again.
+"""]]
diff --git a/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_7_ad6f385a2b95803eb9d81dfe76359551._comment b/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_7_ad6f385a2b95803eb9d81dfe76359551._comment
new file mode 100644
index 000000000..de8403c52
--- /dev/null
+++ b/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_7_ad6f385a2b95803eb9d81dfe76359551._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlutNrg7ajiNAfi5gqJfD8crv0aimZa27k"
+ nickname="Chuck"
+ subject="I'm having this problem too"
+ date="2013-07-21T19:14:21Z"
+ content="""
+I'm a git-annex newbie looking for Dropbox-like functionality.  I've got git-annex and the webapp running on my desktop and laptop, and I believe I've got a Jabber account working since Kopete seems happy with my account info.  But when I enter the correct Gmail UID and password I get the above error.
+
+I'm running the version of git-annex that's current in the standard Ubuntu repos (I'm actually running Kubuntu if that matters), and that version is 20121112ubuntu2.  If this is an issue that was fixed in the 20121126 release, how would I get that?  Doing the standard install gets me the version I have now...
+"""]]
diff --git a/doc/forum/webapp_and_manual_mode.mdwn b/doc/forum/webapp_and_manual_mode.mdwn
new file mode 100644
index 000000000..f7a903387
--- /dev/null
+++ b/doc/forum/webapp_and_manual_mode.mdwn
@@ -0,0 +1,7 @@
+Somehow I seemingly have not understood the manual mode.
+
+If I have a file in my repository, that is not yet in the annex (or in git), and I start the webapp, that file is automatically added to git-annex (and git).
+
+Why is that?
+
+And how can I use the webapp without such interference?
diff --git a/doc/forum/webapp_and_manual_mode/comment_1_5b5df5ffeb6ee15779972f13fdc11729._comment b/doc/forum/webapp_and_manual_mode/comment_1_5b5df5ffeb6ee15779972f13fdc11729._comment
new file mode 100644
index 000000000..677dd0414
--- /dev/null
+++ b/doc/forum/webapp_and_manual_mode/comment_1_5b5df5ffeb6ee15779972f13fdc11729._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.140"
+ subject="comment 1"
+ date="2013-07-21T17:17:58Z"
+ content="""
+Setting a repository to manual mode prevents the assistant from transferring new files into that repository. You have to manually run `git annex get`.
+
+To prevent the assistant from automatically adding files, you can click the pause button next to the current repository in the webapp.
+"""]]
diff --git a/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn b/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn
new file mode 100644
index 000000000..93ccc083d
--- /dev/null
+++ b/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn
@@ -0,0 +1,7 @@
+I like the way btsync search for the peer. So if I need to sync my laptop and other family laptop both with a total different and changing network setup the two device found each other do NAT traversal if needed use relays but the end the two folders are synced. But its closed-source :( I like git and git-annex looks really great. I'm learning it now.
+
+First I thought with xmpp I can sync files without ssh/rsync or other remote access to my devices just with two jabber account. Now I know I can't. :(
+
+It would be just great to have some means to sync files without cloud just the two device. Without the ssh / rsync jut share some secret and the devices do the rest. :-o
+
+Anyway thanks for hearing. I'm looking forward to know more about git-annex. Thank you for that sw. =-<>-=
diff --git a/doc/walkthrough/using_ssh_remotes.mdwn b/doc/walkthrough/using_ssh_remotes.mdwn
index 60011a200..1dc8fa55b 100644
--- a/doc/walkthrough/using_ssh_remotes.mdwn
+++ b/doc/walkthrough/using_ssh_remotes.mdwn
@@ -1,6 +1,6 @@
 So far in this walkthrough, git-annex has been used with a remote
 repository on a USB drive. But it can also be used with a git remote
-that is truely remote, a host accessed by ssh.
+that is truly remote, a host accessed by ssh.
 
 Say you have a desktop on the same network as your laptop and want
 to clone the laptop's annex to it: