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

doc/bugs/Addurl_with_quvi_not_working.mdwn

@@ -0,0 +1,71 @@
+### Please describe the problem.
+
+When adding a video with "addurl", git-annex claims that quvi does not know how to download the url. When using "quvi get" on the same url the video gets downloaded.
+
+This seems to be independent of the video hosting site and occured on all I tested.
+
+### What steps will reproduce the problem?
+
+Download a video with
+
+    git annex addurl "[URL]"
+
+and do the same with
+
+    quvi get "[URL]"
+
+.
+
+
+### What version of git-annex are you using? On what operating system?
+
+OS: Archlinux, fully updated
+
+    git-annex version: 5.20131118-gc7e5cde
+    build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
+    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
+    remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3 5
+    upgrade supported from repository versions: 0 1 2 4
+
+
+### Please provide any additional information below.
+
+# Git-annex:
+
+    user@asus aaa [master] % git annex addurl "https://www.youtube.com/watch?v=TUrQsK5ouSg"
+    quvi v0.9.5
+      built on 2013-11-12 17:02:06 +0000 for x86_64-unknown-linux-gnu
+        with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
+      configuration: --prefix=/usr
+    libquvi v0.9.4
+      built on 2013-11-12 16:58:23 +0000 for x86_64-unknown-linux-gnu
+        with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
+      configuration: --prefix=/usr
+    libquvi-scripts v0.9.20131104
+      configuration: --prefix=/usr --with-nsfw --with-geoblocked
+    
+    Copyright (C) 2012,2013  Toni Gundogdu <legatvs@gmail.com>
+    quvi comes with ABSOLUTELY NO WARRANTY.  You may redistribute copies of
+    quvi under the terms of the GNU Affero General Public License version 3
+    or later. For more information, see <http://www.gnu.org/licenses/agpl.html>.
+    
+    To contact the developers, please mail to <quvi-devel@lists.sourceforge.net>
+    
+    Copyright (C) 2012,2013  Toni Gundogdu <legatvs@gmail.com>
+    quvi comes with ABSOLUTELY NO WARRANTY.  You may redistribute copies of
+    quvi under the terms of the GNU Affero General Public License version 3
+    or later. For more information, see <http://www.gnu.org/licenses/agpl.html>.
+    
+    To contact the developers, please mail to <quvi-devel@lists.sourceforge.net>
+    git-annex: quvi does not know how to download url https://www.youtube.com/watch?v=TUrQsK5ouSg
+
+# Quvi:
+
+    user@asus aaa [master] % quvi get "https://www.youtube.com/watch?v=TUrQsK5ouSg"
+    file: GitAnnex Assistant Hak5 14223.mp4  [media]                                                       
+      content length: 162.2Mi  content type: video/mp4  mode: resume
+    copy: --=-  100%   488.9Ki/s  00:05:37
+

doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_1_d4f22335d5b6cb178c77579a1b450f9c._comment

@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkptNW1PzrVjYlJWP_9e499uH0mjnBV6GQ"
+ nickname="Christian"
+ subject="Same on CyaogenMod 10.2"
+ date="2013-11-29T11:00:58Z"
+ content="""
+CM10.2 Nightly Build for Sony Experia Mini Pro does show the same behaviour. Creating the resolv.conf does not solve the problem:
+
+    1|root@mango:/etc # touch resolv.conf; ls resolv.conf
+    touch resolv.conf; ls resolv.conf
+    resolv.conf: No such file or directory
+
+"""]]

doc/bugs/Symlinks.mdwn

@@ -0,0 +1,26 @@
+### Please describe the problem.
+Symlinks get dereferenced.
+
+### What steps will reproduce the problem?
+Include a symlink in the repo.  Wait until another client syncs the repo.
+
+### What version of git-annex are you using? On what operating system?
+git-annex version: 5.20131117-gbd514dc
+
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+
+remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
+
+local repository version: unknown
+
+default repository version: 3
+
+supported repository versions: 3 5
+
+upgrade supported from repository versions: 0 1 2 4
+
+### Please provide any additional information below.
+I have a file `/Users/lhunath/annex/Library/Application Support/CrossOver/Bottles/Fallout 3/drive_c/users/crossover/My Documents` which is a symlink to `~/Documents` on the originating client. On the destination client, This turns into a directory, causing the whole content of `~/Documents` to get included in each bottle, which includes a bunch of VM images etc.....
+

doc/forum/rebuild_location_log_from_encrypted_remote.mdwn

@@ -0,0 +1,35 @@
+Hi,
+
+I apologize, but I can't retrace my steps, so my problem is not replicable. The current situation is: 1 main repo and 1 directory/encrypted special remote. From the main repo, I see 0 available copy of the files I need. But when I do a fsck I do see the file. The problem is that the location log does not seem to get fixed after fsck, as I cannot use git-annex get to obtain the file, even after the fsck command. 
+
+Do you have any suggestions for next diagnostic/repair steps?
+
+Thanks a lot for your time and answer!
+
+Vincent
+
+macbook% git annex fsck foo.zip --from needle
+fsck foo.zip (gpg) 
+You need a passphrase to unlock the secret key for
+user: “me <email@email.edu>”
+2048-bit RSA key, ID ???????, created 2013-01-11 (main key ID ????????)
+
+(checking needle...) 
+GPGHMACSHA1--d7036fd17214c06c83d53479dcec9554a7dc2109
+    13815014 100%   14.16MB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 13816832 bytes  received 42 bytes  9211249.33 bytes/sec
+total size is 13815014  speedup is 1.00
+(fixing location log) (checksum...) 
+  ** No known copies exist of foo.zip
+failed
+(Recording state in git...)
+git-annex: fsck: 1 failed
+
+
+macbook% git annex get foo.zip
+get foo.zip (not available) 
+  No other repository is known to contain the file.
+failed
+git-annex: get: 1 failed
+macbook% 

doc/tips/The_perfect_preferred_content_settings_for_my_android_phone.mdwn

@@ -10,7 +10,7 @@ So I came up with this solution, and I'm very happy with it.
 
 This will sync my music and book collections to my phone whenever I add something new on my computers, and it will sync and keep anything I add to the annex on my phone. Best of all worlds! Impressed how flexible preferred content is. More full-sync folders can be added like this: 
 
-    include=Music/* or include=Books/* or Notes/* or present
+    include=Music/* or include=Books/* or include = Notes/* or present
 
 To add them, I first had to figure out the uuid of my phone repo. So I added a new tab on android, and did
 
@@ -29,4 +29,8 @@ to
 
     content [phone-uuid] = include=Music/* or include=Books/* or Notes/* or present
 
+and commented out
+
+    #group [phone-uuid] = client
+
 And waited for it to sync.

doc/todo/New_special_remote_suggeston_-_clean_directory/comment_4_1dae745cff1c0a38232d033dcc542ac4._comment

@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmVICFY2CDP08xdsPr3cgmScomy9HA-1sk"
+ nickname="Andrew"
+ subject="comment 4"
+ date="2013-11-29T04:11:24Z"
+ content="""
++1 for this style of repository (again).
+
+Presenting the content of a git-annex repository in a way that
+
+1. is transparent (nobody but me need know or care it's a git-annex repository)
+2. doesn't require installation (NAS or other device I can't install to)
+3. works without thinking (doesn't required commits or checkouts or manual deferencing symlinks - see also point 1)
+
+would fulfil the \"like dropbox but awesome\" idea from the Kickstarter.
+"""]]