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

6 files changed, 57 insertions, 1 deletions

diff --git a/doc/bugs/Crash_when_adding_jabber_account_/comment_2_e49af3b8a937d82eda1509b6f67b21d4._comment b/doc/bugs/Crash_when_adding_jabber_account_/comment_2_e49af3b8a937d82eda1509b6f67b21d4._comment
new file mode 100644
index 000000000..03f7a2069
--- /dev/null
+++ b/doc/bugs/Crash_when_adding_jabber_account_/comment_2_e49af3b8a937d82eda1509b6f67b21d4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn-4QWOFI0QQ4n-yu-oFq3PHeuSPUv_-b4"
+ nickname="Rodrigo"
+ subject="comment 2"
+ date="2013-01-14T22:10:44Z"
+ content="""
+32 bit. Yes, the standalone tarball. From terminal, I'm simply running: git-annex webapp
+"""]]
diff --git a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_2_ef849e25b0264808bff800d9d3836119._comment b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_2_ef849e25b0264808bff800d9d3836119._comment
new file mode 100644
index 000000000..ec7867653
--- /dev/null
+++ b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_2_ef849e25b0264808bff800d9d3836119._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="arafel"
+ ip="94.174.218.177"
+ subject="comment 2"
+ date="2013-01-14T20:50:50Z"
+ content="""
+It did seem unlikely that you hadn't tested that. :-)
+
+Oddly, there doesn't seem to be a daemon.log file in that directory. I don't have the drive handy to test at the moment - when I do I'll try the commands you suggest and see what the output is.
+"""]]
diff --git a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_3_ae3cbd0eb69cbeb9b349e0060d056d43._comment b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_3_ae3cbd0eb69cbeb9b349e0060d056d43._comment
new file mode 100644
index 000000000..f2e5394ce
--- /dev/null
+++ b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X/comment_3_ae3cbd0eb69cbeb9b349e0060d056d43._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="arafel"
+ ip="94.174.218.177"
+ subject="comment 3"
+ date="2013-01-14T21:19:12Z"
+ content="""
+Pauls-MacBook-Pro:annex Paul$ cd /Volumes/G-DRIVE\ slim/annex/
+
+Pauls-MacBook-Pro:annex Paul$ git config annex.uuid 6898F314-7817-4CD5-B1C3-588C55522A3B
+
+error: could not lock config file .git/config: No such file or directory
+
+Pauls-MacBook-Pro:annex Paul$ ls -a
+
+.	..
+
+Looks like it created the directory but never got as far as 'git init'. Is it safe to just run that command, and will that (followed by the config) be enough? Or is there more to it than that? e.g. creating the remotes
+"""]]
diff --git a/doc/bugs/No_progress_bars_with_S3/comment_2_52361805ced99c22d663b3b1e8a5b221._comment b/doc/bugs/No_progress_bars_with_S3/comment_2_52361805ced99c22d663b3b1e8a5b221._comment
new file mode 100644
index 000000000..04f823e0b
--- /dev/null
+++ b/doc/bugs/No_progress_bars_with_S3/comment_2_52361805ced99c22d663b3b1e8a5b221._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="annexuser"
+ ip="24.16.193.140"
+ subject="comment 2"
+ date="2013-01-14T21:26:18Z"
+ content="""
+4MB to 8MB
+"""]]
diff --git a/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_5_899c4afbc988d81984c5c3397285bb01._comment b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_5_899c4afbc988d81984c5c3397285bb01._comment
new file mode 100644
index 000000000..fb3838511
--- /dev/null
+++ b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_5_899c4afbc988d81984c5c3397285bb01._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo"
+ nickname="Justin"
+ subject="comment 5"
+ date="2013-01-14T21:57:30Z"
+ content="""
+If you have both the corrupted file and the good file you can use the `cmp` command to show exactly how they differ:
+
+    cmp -l file1 file2
+
+If files are regularly marked as corrupted you might have bad ram.
+"""]]
diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
index 88e7256d7..09f258940 100644
--- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
+++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
@@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
 adept friends or family -- what's preventing you from introducing them to
 the assistant?
 
-[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 15 "I need a Windows port" 26 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 20 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit."]]
+[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 15 "I need a Windows port" 27 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 20 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 2 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit."]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.