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

Conflicts:
	doc/polls/2013/command_line_vs_assistant.mdwn

13 files changed, 34 insertions, 10 deletions

diff --git a/doc/polls/2013/command_line_vs_assistant.mdwn b/doc/polls/2013/command_line_vs_assistant.mdwn
index 5f8ce9b8b..9a2dc1171 100644
--- a/doc/polls/2013/command_line_vs_assistant.mdwn
+++ b/doc/polls/2013/command_line_vs_assistant.mdwn
@@ -2,6 +2,6 @@ To start off the 2013 git-annex user survey, let's see how many users
 type `git annex` commands at the command line, and how many use the
 [[/assistant]] (and its webapp).
 
-[[!poll open=yes 0 "I use mostly the git-annex assistant" 1 "I use mostly git-annex at the command line" 0 "I use both equally often" 0 "I do not yet use git-annex"]]
+[[!poll open=yes 1 "I use mostly the git-annex assistant" 8 "I use mostly git-annex at the command line" 0 "I use both equally often" 0 "I do not yet use git-annex"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/command_line_vs_assistant/comment_1_b86363a5e0ae82792a678b520568b2ad._comment b/doc/polls/2013/command_line_vs_assistant/comment_1_b86363a5e0ae82792a678b520568b2ad._comment
new file mode 100644
index 000000000..ac3e5a2f0
--- /dev/null
+++ b/doc/polls/2013/command_line_vs_assistant/comment_1_b86363a5e0ae82792a678b520568b2ad._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="EskildHustvedt"
+ ip="84.48.82.103"
+ subject="Missing option: both"
+ date="2013-11-13T21:41:44Z"
+ content="""
+I use the assistant for data that changes often (ie. documents). Command-line for data that changes rarely (videos, music etc.).
+"""]]
diff --git a/doc/polls/2013/direct_vs_indirect_mode.mdwn b/doc/polls/2013/direct_vs_indirect_mode.mdwn
index 7802264c6..72e097f9b 100644
--- a/doc/polls/2013/direct_vs_indirect_mode.mdwn
+++ b/doc/polls/2013/direct_vs_indirect_mode.mdwn
@@ -1,5 +1,5 @@
 I'm curious to see how popular [[/direct_mode]] is versus indirect mode.
 
-[[!poll open=yes 0 "I use mostly indirect mode" 0 "I use mostly direct mode" 0 "I use direct and indirect mode equally" 1 "I use indirect mode when possible, but am forced to use direct mode on some platforms" 0 "I use whatever is the default" 0 "I don't know"]]
+[[!poll open=yes 4 "I use mostly indirect mode" 0 "I use mostly direct mode" 2 "I use direct and indirect mode equally" 4 "I use indirect mode when possible, but am forced to use direct mode on some platforms" 0 "I use whatever is the default" 0 "I don't know"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/git_level.mdwn b/doc/polls/2013/git_level.mdwn
index 8412136f6..e8e21ba6e 100644
--- a/doc/polls/2013/git_level.mdwn
+++ b/doc/polls/2013/git_level.mdwn
@@ -1,6 +1,6 @@
 How would you characterize your general git knowledge?
 (Not your git-annex knowledge!)
 
-[[!poll expandable=yes open=yes 0 "novice" 0 "casual, needs advice" 0 "everyday use" 0 "can offer advice" 0 "know it very well" 0 "wrote some of it"]]
+[[!poll expandable=yes open=yes 0 "novice" 1 "casual, needs advice" 0 "everyday use" 6 "can offer advice" 0 "know it very well" 2 "wrote some of it"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/happyness.mdwn b/doc/polls/2013/happyness.mdwn
index 0a88d1c8f..7f9ed3b73 100644
--- a/doc/polls/2013/happyness.mdwn
+++ b/doc/polls/2013/happyness.mdwn
@@ -1,5 +1,5 @@
 Overall, how happy are you with git annex?
 
-[[!poll expandable=yes open=yes 0 "unhappy" 0 "not so happy" 0 "happy" 0 "very happy" 0 "completely ecstatic"]]
+[[!poll expandable=yes open=yes 0 "unhappy" 0 "not so happy" 3 "happy" 9 "very happy" 0 "completely ecstatic"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/how_installed.mdwn b/doc/polls/2013/how_installed.mdwn
index 236a29aab..c0b07c591 100644
--- a/doc/polls/2013/how_installed.mdwn
+++ b/doc/polls/2013/how_installed.mdwn
@@ -1,6 +1,6 @@
 How do you get git-annex installed?
 
-[[!poll expandable=yes open=yes 0 "From a prebuilt version on this website" 0 "I build from source" 0 "I install the version provided by my OS distributor" 0 "I don't know; it was installed for me"]]
+[[!poll expandable=yes open=yes 4 "From a prebuilt version on this website" 1 "I build from source" 4 "I install the version provided by my OS distributor" 0 "I don't know; it was installed for me" 1 "homebrew -> cabal"]]
 
 If you install it using different methods at different times, pick the
 method you use most frequently.
diff --git a/doc/polls/2013/missing_ports.mdwn b/doc/polls/2013/missing_ports.mdwn
index b95cc0a65..85e111844 100644
--- a/doc/polls/2013/missing_ports.mdwn
+++ b/doc/polls/2013/missing_ports.mdwn
@@ -6,6 +6,6 @@ If there's a device on which you cannot use git-annex today, because the
 port to an OS is missing or incomplete, please pick it. Please don't vote
 for an OS where you already successfully use git-annex.
 
-[[!poll expandable=yes open=yes 1 "I'm good -- git-annex runs on my OS of choice!" 0 "Windows" 0 "Android" 0 "Apple iOS"]]
+[[!poll expandable=yes open=yes 2 "I'm good -- git-annex runs on my OS of choice!" 3 "Windows" 3 "Android" 2 "Apple iOS"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/missing_ports/comment_1_759c6a53a12960d67bcb19d075c9ff80._comment b/doc/polls/2013/missing_ports/comment_1_759c6a53a12960d67bcb19d075c9ff80._comment
new file mode 100644
index 000000000..4b38682f9
--- /dev/null
+++ b/doc/polls/2013/missing_ports/comment_1_759c6a53a12960d67bcb19d075c9ff80._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 1"
+ date="2013-11-13T21:15:56Z"
+ content="""
+Is an iOS port even a possibility?  It would be outstanding if it were.  Lately I've moved from using mostly-android for mobile purposes to mostly-iOS, and it makes me sad not to be able to use git annex directly.  Though I might eventually get around to having git-annex assistant running on a server at home which I can sftp to, and use it secondhand that way.
+"""]]
diff --git a/doc/polls/2013/missing_ports/comment_2_72b6cb67379dfcea3afb6eb8c326c4b0._comment b/doc/polls/2013/missing_ports/comment_2_72b6cb67379dfcea3afb6eb8c326c4b0._comment
new file mode 100644
index 000000000..e3a6074a0
--- /dev/null
+++ b/doc/polls/2013/missing_ports/comment_2_72b6cb67379dfcea3afb6eb8c326c4b0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.246"
+ subject="comment 2"
+ date="2013-11-13T21:18:22Z"
+ content="""
+iOS is probably technically possible -- the ghc iOS support is getting pretty good and probably is better than Android.
+"""]]
diff --git a/doc/polls/2013/number_of_repositories.mdwn b/doc/polls/2013/number_of_repositories.mdwn
index d99a951e8..c06607135 100644
--- a/doc/polls/2013/number_of_repositories.mdwn
+++ b/doc/polls/2013/number_of_repositories.mdwn
@@ -2,6 +2,6 @@ How many git-annex repositories do you have? This can be different clones
 of the same repository on different machines and drives, and/or completely
 separate git repositories.
 
-[[!poll expandable=yes open=yes 0 "1" 0 "2-5" 0 "6-10" 0 "11-20" 0 "21-30" 0 "31-40" 0 "41-50" 0 "51-60" 0 "61-70" 1 "71-80" 0 "81-90" 0 "91-100"]]
+[[!poll expandable=yes open=yes 1 "1" 5 "2-5" 4 "6-10" 0 "11-20" 1 "21-30" 1 "31-40" 0 "41-50" 0 "51-60" 0 "61-70" 1 "71-80" 0 "81-90" 0 "91-100"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/operating_system.mdwn b/doc/polls/2013/operating_system.mdwn
index 2ec72f034..129f028e3 100644
--- a/doc/polls/2013/operating_system.mdwn
+++ b/doc/polls/2013/operating_system.mdwn
@@ -1,5 +1,5 @@
 Pick the operating system which you use git-annex on the most.
 
-[[!poll expandable=yes open=yes 1 "Linux" 0 "OSX" 0 "Android" 0 "other Unix" 0 "Windows"]]
+[[!poll expandable=yes open=yes 6 "Linux" 3 "OSX" 0 "Android" 0 "other Unix" 1 "Windows"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/size_of_annex.mdwn b/doc/polls/2013/size_of_annex.mdwn
index d56acf39a..1deb8657b 100644
--- a/doc/polls/2013/size_of_annex.mdwn
+++ b/doc/polls/2013/size_of_annex.mdwn
@@ -7,6 +7,6 @@ that says "size of annexed files in working tree" or "known annex size".
 If you've got multiple repositories that each contain different files
 (not git clones), you can run it in each and add them up.
 
-[[!poll expandable=yes open=yes 0 "less than 1+ GB" 0 "1+ GB" 0 "10+ GB" 0 "100+ GB" 0 "1+ TB" 0 "2+ TB" 0 "4+ TB" 1 "8+ TB" 0 "16+ TB" 0 "32+ TB" 0 "64+ TB" 0 "128+ TB" 0 "rather not say"]]
+[[!poll expandable=yes open=yes 0 "less than 1+ GB" 0 "1+ GB" 6 "10+ GB" 5 "100+ GB" 1 "1+ TB" 0 "2+ TB" 1 "4+ TB" 1 "8+ TB" 0 "16+ TB" 0 "32+ TB" 0 "64+ TB" 0 "128+ TB" 0 "rather not say"]]
 
 [[!sidebar content=""]]
diff --git a/doc/polls/2013/using_for.mdwn b/doc/polls/2013/using_for.mdwn
index 272569b68..5c5b6ba38 100644
--- a/doc/polls/2013/using_for.mdwn
+++ b/doc/polls/2013/using_for.mdwn
@@ -1,5 +1,5 @@
 What kind of data do you mostly use git-annex to store?
 
-[[!poll expandable=yes open=yes 0 "personal data" 0 "business data" 0 "scientific data" 0 "game development assets" 0 "rather not say"]]
+[[!poll expandable=yes open=yes 9 "personal data" 0 "business data" 2 "scientific data" 0 "game development assets" 0 "rather not say"]]
 
 [[!sidebar content=""]]