summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-11 12:11:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-11 12:11:18 -0400
commit604bbd94e7bbfdad2e5b7d13729db7838a9abdb1 (patch)
tree6c3503c75dee15e165436cf3a181defff39012ed
parent03c1a1906bbd96538d41a40622d0e565de527dd2 (diff)
parent07c6ee1b42625da15607a379ecdb8bba8ab3668f (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/design/assistant/blog/day_102__very_high_level_programming/comment_1_c028b403261dd66bcf83e6ffd134b80b._comment8
-rw-r--r--doc/design/assistant/polls/prioritizing_special_remotes.mdwn2
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/design/assistant/blog/day_102__very_high_level_programming/comment_1_c028b403261dd66bcf83e6ffd134b80b._comment b/doc/design/assistant/blog/day_102__very_high_level_programming/comment_1_c028b403261dd66bcf83e6ffd134b80b._comment
new file mode 100644
index 000000000..d9be239bd
--- /dev/null
+++ b/doc/design/assistant/blog/day_102__very_high_level_programming/comment_1_c028b403261dd66bcf83e6ffd134b80b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlVwbp82f-7rNOyEpvqc9A8FEfn7wl2Akw"
+ nickname="Jos"
+ subject="Works for me"
+ date="2012-10-11T13:40:08Z"
+ content="""
+These categories make it much clearer to me how I will be able to use git annex assistant
+"""]]
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index 892bbcb52..db86be3e5 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
-[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 54 "My phone (or MP3 player)" 7 "Tahoe-LAFS" 3 "OpenStack SWIFT" 16 "Google Drive"]]
+[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 54 "My phone (or MP3 player)" 7 "Tahoe-LAFS" 4 "OpenStack SWIFT" 16 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they