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

4 files changed, 24 insertions, 1 deletions

diff --git a/doc/bugs/Unknown_remote_type_webdav.mdwn b/doc/bugs/Unknown_remote_type_webdav.mdwn
new file mode 100644
index 000000000..77af44895
--- /dev/null
+++ b/doc/bugs/Unknown_remote_type_webdav.mdwn
@@ -0,0 +1,5 @@
+When I attempt to setup a [box.com special remote](http://git-annex.branchable.com/tips/using_box.com_as_a_special_remote/) I get the following error:
+
+    git-annex: Unknown remote type webdav
+
+I'm using the Linux prebuilt tarball. Does it not include webdav support?
diff --git a/doc/bugs/assistant_does_not_list_remote___39__origin__39__/comment_1_ffa008240c61b50396aa92f467731db6._comment b/doc/bugs/assistant_does_not_list_remote___39__origin__39__/comment_1_ffa008240c61b50396aa92f467731db6._comment
new file mode 100644
index 000000000..8f6cb5317
--- /dev/null
+++ b/doc/bugs/assistant_does_not_list_remote___39__origin__39__/comment_1_ffa008240c61b50396aa92f467731db6._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmaMxYm33s0H-nxBo5uzYUzdIECoyR8Ug8"
+ nickname="Stefan"
+ subject="an update"
+ date="2013-02-13T20:33:22Z"
+ content="""
+The remotes were not listed because git-annex-shell was not working (found in the path, however necessary *.so files were not found).
+
+Now all remotes are listed. `.git/config` is ok, with the uuid listed. `git annex status` returns all.
+
+However sync is not working. The webapp on the workstation states that it has synced with the server, however `ls` on the server returns empty. The server is set as archive, the workstation as client.
+"""]]
diff --git a/doc/forum/Different_annexes_pointing_to_same_special_remote__63__.mdwn b/doc/forum/Different_annexes_pointing_to_same_special_remote__63__.mdwn
new file mode 100644
index 000000000..8413a6e08
--- /dev/null
+++ b/doc/forum/Different_annexes_pointing_to_same_special_remote__63__.mdwn
@@ -0,0 +1,6 @@
+Is there likely to be any problem in pointing different annexes to the same special remote (i.e. rsync/box.com/etc.) ?
+
+As the objects are stored based on their SHA256 key the expectation is that the chance of collision is is small.
+
+The only problem I can foresee is where the same content is stored in more than one annex and it is deleted in the remote in one annex, but not the other - there won't be any protection against that, but for non-overlapping content this risk should be negligible.
+
diff --git a/doc/todo/Use_a_remote_as_a_sharing_site_for_files_with_obfuscated_URLs.mdwn b/doc/todo/Use_a_remote_as_a_sharing_site_for_files_with_obfuscated_URLs.mdwn
index 9d84202bc..a42a81d02 100644
--- a/doc/todo/Use_a_remote_as_a_sharing_site_for_files_with_obfuscated_URLs.mdwn
+++ b/doc/todo/Use_a_remote_as_a_sharing_site_for_files_with_obfuscated_URLs.mdwn
@@ -1,6 +1,6 @@
 There are times when it is handy to be able to upload a file to a web host somewhere and share a link for that file to a select few people.
 
-It seems to be that the assistant could handle this scenario. It could generate a directory with a random name on the remote, and transfer the file there (using the existing filename) and the links could be displayed in the assistant web app to allow the user to copy them the appropriate people.
+It seems to be that the assistant could handle this scenario. It could generate a directory with a random name on the remote, and transfer the file there (using the existing filename) and the appropriate URL could be displayed in the assistant webapp to allow the user to copy the URL to send it to the appropriate people.
 
 Note: Joey and I had a quick chat about this use case at LCA2013.