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

9 files changed, 101 insertions, 0 deletions

diff --git a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment b/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment
new file mode 100644
index 000000000..55a368cc3
--- /dev/null
+++ b/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx07B9weuZowXqh--1BDvGw8VM25aXsRw"
+ nickname="Matthew"
+ subject="comment 2"
+ date="2014-02-01T02:44:47Z"
+ content="""
+Same here, any workarounds?
+"""]]
diff --git a/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9/comment_1_91a961cfa5dd4d6f0e4abfbbcfb81e92._comment b/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9/comment_1_91a961cfa5dd4d6f0e4abfbbcfb81e92._comment
new file mode 100644
index 000000000..7ab46c3bb
--- /dev/null
+++ b/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9/comment_1_91a961cfa5dd4d6f0e4abfbbcfb81e92._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl7Tgnd2BBdIXVlNKjG4dkTj3paf7FHeHQ"
+ nickname="Andreas"
+ subject="ssh-askpass workaround does work"
+ date="2014-02-01T06:28:41Z"
+ content="""
+I've just gotten my rsync.net account unwedged, and can confirm that the ssh-askpass hack does work. After what seemed like git-annex successfully uploading an ssh keypair to the rsync.net remote, I removed the ssh-askpass stub script and rolled my rsync.net password. Now, I'm getting these log entries:
+
+```
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+Received disconnect from 69.43.165.5: 2: Too many authentication failures for 40407
+rsync: connection unexpectedly closed (0 bytes received so far) [sender]
+rsync error: unexplained error (code 255) at /SourceCache/rsync/rsync-42/rsync/io.c(452) [sender=2.6.9]
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+Permission denied, please try again.
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+Received disconnect from 69.43.165.5: 2: Too many authentication failures for 40407
+rsync: connection unexpectedly closed (0 bytes received so far) [sender]
+rsync error: unexplained error (code 255) at /SourceCache/rsync/rsync-42/rsync/io.c(452) [sender=2.6.9]
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+Permission denied, please try again.
+ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory
+Received disconnect from 69.43.165.5: 2: Too many authentication failures for 40407
+rsync: connection unexpectedly closed (0 bytes received so far) [sender]
+rsync error: unexplained error (code 255) at /SourceCache/rsync/rsync-42/rsync/io.c(452) [sender=2.6.9]
+```
+
+Looks like git-annex asks for the password for some reason? I'm not sure what's going on here, please advise.
+"""]]
diff --git a/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_4_f3266b74517b421e5310e67818fe3969._comment b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_4_f3266b74517b421e5310e67818fe3969._comment
new file mode 100644
index 000000000..faaa7ed09
--- /dev/null
+++ b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_4_f3266b74517b421e5310e67818fe3969._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkVnM7Ol2kr_jfLg6h_oXpmNdxWHIiL9mk"
+ nickname="Hanno"
+ subject="comment 4"
+ date="2014-01-31T23:17:49Z"
+ content="""
+I have no idea if it is related to this problem, but allow me to add that the \"Consistency check\" (that the web app specifically recommended me to activate) makes my computers unreasonably slow immediately after each bootup. This is both at the fairly fast computer at the office and the ok-ish old laptop at home.
+
+Also, the check will kick in and suck up the systems responsiveness right after connecting the external USB sneaker disk, making any regular file transfer to the disk extremely slow (more than once I was stung because I just wanted to quickly move a bigger file to the disk and walk home at the end of an office day but git-annex would go into its check after mounting).
+
+Thanks!
+"""]]
diff --git a/doc/bugs/git-annex_webapp_command_not_found/comment_3_f593752a0c5c60daaacca46ced5ac5d8._comment b/doc/bugs/git-annex_webapp_command_not_found/comment_3_f593752a0c5c60daaacca46ced5ac5d8._comment
new file mode 100644
index 000000000..531714d5c
--- /dev/null
+++ b/doc/bugs/git-annex_webapp_command_not_found/comment_3_f593752a0c5c60daaacca46ced5ac5d8._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk4_47QIHYfGlI9aL04LXxOczcYABmmIfA"
+ nickname="Mike"
+ subject="On Opensuse 13.1 - I was able to run git-annex-webapp once.  "
+ date="2014-02-01T15:34:50Z"
+ content="""
+As soon as I removed my single repository it never loaded again.  I have re-booted.  re-installed.   I have the package installed it tries to load but doesn't.   I have the stand-alone installed it does nothing.    Only if I try to execute webapp as superuser does it launch the browser but doesn't execute properly. comes up to some url file://???     when it was working properly i noticed it was opening to locahost url 127.0.0.1/something
+
+Still seems to be running on my desktop machine though.  But i did not try to remove the repository from that machine because git-annex does not provide a way to remove repository without actually deleting the files.   Evidently Disable and Delete do exactly the same thing.
+
+Any ideas?  thanks. Mike
+"""]]
diff --git a/doc/bugs/git-annex_webapp_command_not_found/comment_4_e4ef964274e74cb4a39dc8ecac8ceade._comment b/doc/bugs/git-annex_webapp_command_not_found/comment_4_e4ef964274e74cb4a39dc8ecac8ceade._comment
new file mode 100644
index 000000000..bc804d98a
--- /dev/null
+++ b/doc/bugs/git-annex_webapp_command_not_found/comment_4_e4ef964274e74cb4a39dc8ecac8ceade._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk4_47QIHYfGlI9aL04LXxOczcYABmmIfA"
+ nickname="Mike"
+ subject="On Opensuse 13.1 - I was able to run git-annex-webapp once.  "
+ date="2014-02-01T15:35:10Z"
+ content="""
+As soon as I removed my single repository it never loaded again.  I have re-booted.  re-installed.   I have the package installed it tries to load but doesn't.   I have the stand-alone installed it does nothing.    Only if I try to execute webapp as superuser does it launch the browser but doesn't execute properly. comes up to some url file://???     when it was working properly i noticed it was opening to locahost url 127.0.0.1/something
+
+Still seems to be running on my desktop machine though.  But i did not try to remove the repository from that machine because git-annex does not provide a way to remove repository without actually deleting the files.   Evidently Disable and Delete do exactly the same thing.
+
+Any ideas?  thanks. Mike
+"""]]
diff --git a/doc/bugs/ran_once_then_stopped_running_opensuse_13.1.mdwn b/doc/bugs/ran_once_then_stopped_running_opensuse_13.1.mdwn
new file mode 100644
index 000000000..922b08347
--- /dev/null
+++ b/doc/bugs/ran_once_then_stopped_running_opensuse_13.1.mdwn
@@ -0,0 +1,12 @@
+Installed stand-alone tarball amd64.
+I was able to launch webapp. (on laptop)
+Created a repository to local home directory.
+Then ceated another repository to invite local desktop pc.(this one had all the files i wanted to sync) 
+Went to dektop and accepted invitation.  But both machines never stopped synching?  and nothing really happened.
+so I removed repository on laptop to start fresh.
+But now webapp does nothing.  I removed and re-installed a few times but still nothing.
+Only as superuser will the webapp attempt to load but fails because it is super user running.
+As far as version of git-annex...  it prompted to upgrade and i think i saw a 5 in there somewhere.
+
+and since it won't load anymore i guess there is no log.
+
diff --git a/doc/comments.mdwn b/doc/comments.mdwn
index e19962b92..21dac7699 100644
--- a/doc/comments.mdwn
+++ b/doc/comments.mdwn
@@ -7,3 +7,9 @@ Comments in the [[!commentmoderation desc="moderation queue"]]:
 
 Recent comments posted to this site:
 [[!inline pages="comment(*)" template="comment"]]
+
+Thank you for developing Git-annex it is of great help. Also I am not a code person (well was when Turbo Pascal was the rage) so having the assistant for os x and I assume Windows 7 should be of great help. 
+
+Regards,
+
+KT
diff --git a/doc/forum/How_does_one_change_the_number_of_simultaneous_uploads.mdwn b/doc/forum/How_does_one_change_the_number_of_simultaneous_uploads.mdwn
new file mode 100644
index 000000000..8de9cc769
--- /dev/null
+++ b/doc/forum/How_does_one_change_the_number_of_simultaneous_uploads.mdwn
@@ -0,0 +1,3 @@
+I want to upload and download more than one file at a time to and from the various remotes.
+
+How do I do that?
diff --git a/doc/forum/What_happens_when_in_the_git-annex_assistant_you___34__Add_another_local_repository__34___on_an_existing_repository__63__.mdwn b/doc/forum/What_happens_when_in_the_git-annex_assistant_you___34__Add_another_local_repository__34___on_an_existing_repository__63__.mdwn
new file mode 100644
index 000000000..870f8913e
--- /dev/null
+++ b/doc/forum/What_happens_when_in_the_git-annex_assistant_you___34__Add_another_local_repository__34___on_an_existing_repository__63__.mdwn
@@ -0,0 +1 @@
+I want to add an existing repository using the assistant. Is that the way?