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

5 files changed, 72 insertions, 1 deletions

diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment b/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment
new file mode 100644
index 000000000..851dfe9f8
--- /dev/null
+++ b/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment
@@ -0,0 +1,32 @@
+[[!comment format=mdwn
+ username="robconnolly"
+ ip="118.90.115.19"
+ subject="comment 2"
+ date="2012-12-06T02:29:56Z"
+ content="""
+Hi Joey,
+
+Thanks for your response. Here is the output:
+
+[robert@laforge ~]$ ssh-keygen -P \"\" -f test; cat test.pub
+Generating public/private rsa key pair.
+Your identification has been saved in test.
+Your public key has been saved in test.pub.
+The key fingerprint is:
+84:43:aa:f0:ba:a7:f0:11:41:55:3b:c4:63:6a:71:e1 robert@laforge.enterprise
+The key's randomart image is:
++--[ RSA 2048]----+
+|  ...o=.         |
+| .  .==o         |
+|. . .=E..        |
+| o oo  +         |
+|  +.    S        |
+| . .             |
+|o .              |
+|.o..             |
+|oo.              |
++-----------------+
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIeitbarby1thLPEyVpeT/vDaWt0MJwLPvhT7TEZv0FedYalvz/mm3enULHiYdxkjWGBaO/EEzfmz5bjhoJx2tsqSLsUj/UZVv0LxsSfZwTrk0SPuUerzWvAJAXKvtPobDXJoAxsNvzSJN392BMOLKqcjAQTqPA3vd5+EjUVIgJxguz5poGrP0ZRMQD5LmsDrPGUWNJ/EHaVkrqGobAE4DVr8vhJTY41h5Gk2ipnzx+GD6CDZTSNFwl8RorjFAV3mYTTjHc2Cz7GxTLSmwF0+qFZ/UkiO2tD1M37Y4/cPLY7GpVfKvpPHTC8pJUpvj+B4uujHxvZkBJLLz9XhH9KsZ robert@laforge.enterprise
+
+Let me know if you need any more info.
+"""]]
diff --git a/doc/bugs/map_not_respecting_annex_ssh_options__63__/comment_1_c63a1ed5909d53f116f06e60aba74dc6._comment b/doc/bugs/map_not_respecting_annex_ssh_options__63__/comment_1_c63a1ed5909d53f116f06e60aba74dc6._comment
new file mode 100644
index 000000000..029373945
--- /dev/null
+++ b/doc/bugs/map_not_respecting_annex_ssh_options__63__/comment_1_c63a1ed5909d53f116f06e60aba74dc6._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.72"
+ subject="comment 1"
+ date="2012-12-05T17:00:21Z"
+ content="""
+To map a remote, it needs to run `git config --list` on the remote, and the remote may be a non-git-annex git remote. So mapping does a regular ssh first, and cannot use annex.ssh-options (because that would dump it into git-annex-shell). If that fails, it *does* fall back to using git-annex-shell, and will then use annex.ssh-options. 
+
+So, not a bug, I believe.
+"""]]
diff --git a/doc/design/assistant/polls/Android.mdwn b/doc/design/assistant/polls/Android.mdwn
index 650f182c9..78806eac2 100644
--- a/doc/design/assistant/polls/Android.mdwn
+++ b/doc/design/assistant/polls/Android.mdwn
@@ -15,4 +15,4 @@ git-annex.
 Or, I can work on [[Android_porting|design/assistant/android]], and try to
 get the assistant working on Android's built-in storage.
 
-[[!poll open=no 80 "solve the symlink problem first" 17 "port to Android first" 1 "other"]]
+[[!poll open=no 81 "solve the symlink problem first" 17 "port to Android first" 1 "other"]]
diff --git a/doc/forum/git_annex_alternative.mdwn b/doc/forum/git_annex_alternative.mdwn
new file mode 100644
index 000000000..d7c41e66d
--- /dev/null
+++ b/doc/forum/git_annex_alternative.mdwn
@@ -0,0 +1,10 @@
+I really like git-annex and am thankfull to its creator!
+
+I especially like the high level of abstraction it provides when handling backups or syncing.
+
+But git and my ext4 filesystem and HDD just hate the amount of files/folder/symlinks it throws at them and I am asking, what the alternatives are. I am especially looking for the numcopies and "--auto" functionallity. 
+
+
+Most alternatives I checked out (eps. distributed redundant filesystems) come up with other burdens or restrictions.
+
+Do you have any experience with different systems?
diff --git a/doc/preferred_content/comment_1_7d45e21dfb016e9ffa4715346dd0c1a6._comment b/doc/preferred_content/comment_1_7d45e21dfb016e9ffa4715346dd0c1a6._comment
new file mode 100644
index 000000000..728e23dc2
--- /dev/null
+++ b/doc/preferred_content/comment_1_7d45e21dfb016e9ffa4715346dd0c1a6._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0"
+ nickname="Sehr"
+ subject="Interplay with numcopies"
+ date="2012-12-05T20:41:26Z"
+ content="""
+How does the preferred content settings interfere with the numcopies setting?
+
+I could not get behind it. E.g. a case I do not unterstand:
+
+I have a preferred setting evaluating to true and still 
+
+    git annex get --auto
+
+does nothing, if the number of copies produced would surpass the numcopies setting.
+
+
+Thx
+"""]]