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

11 files changed, 114 insertions, 2 deletions

diff --git a/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_2_e7ab75a3c4cd6db900bc2b786bda4e8d._comment b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_2_e7ab75a3c4cd6db900bc2b786bda4e8d._comment
new file mode 100644
index 000000000..8557046d4
--- /dev/null
+++ b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_2_e7ab75a3c4cd6db900bc2b786bda4e8d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnE6kFAbud1LWrQuyX76yMYnUjHt9tR-A8"
+ nickname="Leonardo"
+ subject="comment 2"
+ date="2014-11-18T14:00:58Z"
+ content="""
+I've installed it using the installer.
+I think the problem might be that recent versions of git install somewhere in %AppData% and not in %ProgramFiles%.
+"""]]
diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn
new file mode 100644
index 000000000..2aa4ae2ca
--- /dev/null
+++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+Android 5.0 (apparently) requires PIE executables. [You get "error: only position independent executables (PIE) are supported.")
+
+### What steps will reproduce the problem?
+Trying to start git annex (or the webapp) on android 5.0
+
+### What version of git-annex are you using? On what operating system?
+Currently nightly on Android 5.0 (Nexus 5)
+
+### 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
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn
index 5de9b63b0..bd0cb81a0 100644
--- a/doc/direct_mode.mdwn
+++ b/doc/direct_mode.mdwn
@@ -3,7 +3,7 @@ git, and in turn point at the content of large files that is stored in
 `.git/annex/objects/`. Direct mode gets rid of the symlinks.
 
 The advantage of direct mode is that you can access files directly,
-including modifying them. The disadvantage is that mant regular git
+including modifying them. The disadvantage is that many regular git
 commands cannot be used in a direct mode repository, since they don't
 understand how to update its working tree.
 
diff --git a/doc/forum/Standards_usage_pattern__63__.mdwn b/doc/forum/Standards_usage_pattern__63__.mdwn
new file mode 100644
index 000000000..280e909a5
--- /dev/null
+++ b/doc/forum/Standards_usage_pattern__63__.mdwn
@@ -0,0 +1,8 @@
+Hi,
+
+I have few devices: 2x android, 2x windows, 2x linux and I would like to share at least one folder on all of them.
+None of the devices have public IPs and some regularly change location (work laptops). Because the XMPP support is missing on windows I couldn't find a way to synchronize the repositories (the keys) or did I miss something in the documentation?
+How can I archieve "seamless" synchronization when I start the webapp on the devices?
+
+Thank you,
+Karol
diff --git a/doc/forum/Standards_usage_pattern__63__/comment_1_1ccbfaefe3bbaf767e999cd1c61debfb._comment b/doc/forum/Standards_usage_pattern__63__/comment_1_1ccbfaefe3bbaf767e999cd1c61debfb._comment
new file mode 100644
index 000000000..d96585f9b
--- /dev/null
+++ b/doc/forum/Standards_usage_pattern__63__/comment_1_1ccbfaefe3bbaf767e999cd1c61debfb._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4"
+ nickname="Florian"
+ subject="comment 1"
+ date="2014-11-19T22:01:19Z"
+ content="""
+I think you need at least one server that is reachable from every device and serves as a transfer repository. XMPP is only needed to inform peers about changes. Usual the assistant performs a startup check and detects changes that way. You can't sync content over XMPP. 
+All that is very afaik, I hope for corrections if wrong. 
+"""]]
diff --git a/doc/forum/USB_backup_with_files_visible/comment_9_dfb830fb00c10b797c3d26179e6dfefd._comment b/doc/forum/USB_backup_with_files_visible/comment_9_dfb830fb00c10b797c3d26179e6dfefd._comment
new file mode 100644
index 000000000..f73f18671
--- /dev/null
+++ b/doc/forum/USB_backup_with_files_visible/comment_9_dfb830fb00c10b797c3d26179e6dfefd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE"
+ nickname="Thomas"
+ subject="post-receive hook is not an option with FAT drives"
+ date="2014-11-20T15:53:29Z"
+ content="""
+Hi Joey,
+
+I tried to solve this use case with a post-receive hook and had to realize that FAT does not support the executable bit and thus the hook doesn't run. I've found several requests for the use case described here and I think it would be desirable, if the assistant/webapp could solve it without commandline-hacks.
+
+So I want to stick my thumbdrive in my work desktop and the assistant notices that it's available and starts copying stuff on it and runs git annex merge afterwards.
+
+I also had to manually set annex.diskreserve to a smaller value since annex wants to reserve more space (10G) than is available on most thumb drives. I think git-annex init should be more clever about the default diskreserve value, e.g. set it to a percentage of the total disk size.
+"""]]
diff --git a/doc/forum/Update_on_remote_repo.mdwn b/doc/forum/Update_on_remote_repo.mdwn
new file mode 100644
index 000000000..4977c4159
--- /dev/null
+++ b/doc/forum/Update_on_remote_repo.mdwn
@@ -0,0 +1,6 @@
+Hello,
+
+using the git-annex assistant I can activate auto update on the client machines. What about the server that serves as transfer repository? It needs to have git-annex installed. Is there any possibility of auto update there? What is the recommended procedure?
+
+Thanks,
+Florian
diff --git a/doc/forum/failing_to_add_an_usb_drive_made_me_lose_all_symlinks.mdwn b/doc/forum/failing_to_add_an_usb_drive_made_me_lose_all_symlinks.mdwn
new file mode 100644
index 000000000..3ee7fae84
--- /dev/null
+++ b/doc/forum/failing_to_add_an_usb_drive_made_me_lose_all_symlinks.mdwn
@@ -0,0 +1,27 @@
+Dear all,
+        I had (snif!) and indirect repo with 2.7 of pdf files with filenames were manually added by me with author and title, and took years of work. I had them in a git annex repo from quite some time.  
+Now I'm trying to sync them to an usb drive. Main repo lives in an ubuntu box with ext4 filesystem. I failed many times to do this, both on fat and exfat external drives (direct).  
+As I was failing, I tried to to a test on the same local filesystem. So I have my main repo in /home/juan/papers and the other in /tmp/papers.  
+While trying to sync them using the assistant, i noticed that most of the folders and symlinks from the main repo just dissapeared. 
+I still have them in .git/annex/objects but I don't know how to recover the links. 
+I must say I'm an everyday git user, and big fan of git-annex but I'm trying to use it for six months without luck. I think I will quit after recovering the data, if possible.
+
+EDIT 1
+-------
+After digging around a bit, I found that I had the keys, and could find out the original filename, for example:
+
+    git log --stat -S 1279
+    commit a6362df13d728037875320a457182acb073d08ea
+    Author: Juan Cardelino <x@gmail.com>
+    Date:   Fri Nov 21 11:25:31 2014 -0200
+
+     2013_august/feature_matching_by_searching_maximum_clique_on_high_order_association.pdf | 1 +
+     LevelSets/fedkiw/stanford2002-06.pdf                                                   | 1 +
+     new/nfa/00106994.pdf                                                                   | 1 +
+     3 files changed, 3 insertions(+)
+
+How can I recover them?
+
+EDIT 2
+-------
+Seems that I overwritten my repo with a new repo. Because git log only shows 4 entries from today. Is it possible that the webapp has made that?
diff --git a/doc/forum/weird_view_file_naming.mdwn b/doc/forum/weird_view_file_naming.mdwn
new file mode 100644
index 000000000..1520c6ad3
--- /dev/null
+++ b/doc/forum/weird_view_file_naming.mdwn
@@ -0,0 +1,13 @@
+Very quick one, if anyone has to share experience with views (i would find them useful to get partial checkout views, as long as I can find a special setup to preserve the tree/filenames hyerarchy): 
+
+by using (filtering) views I am getting file names changed to include the (orignal) dir name,
+for instance:
+
+2008/pippo.doc
+
+after a git annex view 2008/=*, comes out as pippo_%2008%.doc
+is this avoidable ?
+
+(i've been trying to follow metadata walkthrough etc. but i always get the dirname in the filename between percents...)
+
+btw: version is 5.20141105
diff --git a/doc/special_remotes/webdav/comment_15_d43673b8c8ed3534f31d026098ab673c._comment b/doc/special_remotes/webdav/comment_15_d43673b8c8ed3534f31d026098ab673c._comment
new file mode 100644
index 000000000..4e78113ac
--- /dev/null
+++ b/doc/special_remotes/webdav/comment_15_d43673b8c8ed3534f31d026098ab673c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn6NYODTE1Sy9YZoi2pvb6i-lcq3dYBxZI"
+ nickname="Karol"
+ subject="android client"
+ date="2014-11-17T18:34:12Z"
+ content="""
+I am stuck at the same problem as Maarten, I cannot create box.com repository..
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial.mdwn b/doc/tips/centralized_git_repository_tutorial.mdwn
index 00283829f..8088e7d23 100644
--- a/doc/tips/centralized_git_repository_tutorial.mdwn
+++ b/doc/tips/centralized_git_repository_tutorial.mdwn
@@ -47,7 +47,7 @@ This file is available directly from the web; so git-annex can download it:
 	(Recording state in git...)
 	# git commit -a -m 'added a screencast I made'
 
-Feel free the rename the files, etc, using normal git commands:
+Feel free to rename the files, etc, using normal git commands:
 
 	# git mv Haskell_Amuse_Bouche-b9FagOVqxmI.mp4 Haskell_Amuse_Bouche.mp4
 	# git mv kitenet.net_~joey_screencasts_git-annex_coding_in_haskell.ogg git-annex_coding_in_haskell.ogg