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

2 files changed, 15 insertions, 1 deletions

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 f64c70f95..6194edba9 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 5 "I'm using the assistant!" 14 "I need a Windows port" 18 "I need an Android port" 1 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 8 "I want to, but have not had the time to try it" 3 "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." 15 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 3 "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. :)" 6 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 11 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 1 "partial content" 1 "Not yet available in macports" 2 "No build yet for Nokia N9" 1 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 3 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 1 "Replaces files with a symlink mess."]]
+[[!poll open=yes expandable=yes 6 "I'm using the assistant!" 14 "I need a Windows port" 19 "I need an Android port" 1 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 8 "I want to, but have not had the time to try it" 3 "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." 16 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 4 "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. :)" 7 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 11 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 1 "partial content" 1 "Not yet available in macports" 2 "No build yet for Nokia N9" 1 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 3 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 2 "Replaces files with a symlink mess." 1 "configurable option to only annex files meeting certian size or filename criteria"]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.
diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment
new file mode 100644
index 000000000..c28b60a2b
--- /dev/null
+++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.7.238"
+ subject="comment 8"
+ date="2013-01-11T20:02:39Z"
+ content="""
+@Alexandre, what you want can be achieved by setting up XMPP pairing, and also [[local pairing|assistant/pairing_walkthrough]]. Then when computers are on the same network, transfers are done via the LAN.
+
+@Laszlo, this can be set up without using the webapp. Just make the two repositories, using the webapp. Then go into each and run \"git remote add myotherrepo $path_to_other_repo\". Then assistant will automatically sync them. I *have* thought about adding a configurator for this to the webapp. It would help to know what use cases you're getting at with this.
+
+@marvin The generated ssh keys are configured to only allow running `git-annex-shell`, which limits it to only acting on the repository. The keys are also configured, in `.ssh/config` to only be used when a particular host alias is used. They should not be used when you just ssh normally to the host. If this is happening to you, please file a bug report with details.
+
+@dzsino you can get file creation dates out of git using git log :)
+"""]]