diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-08 12:12:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-08 12:12:47 -0400 |
| commit | 2c40bf0e8ef60a2af09209c9923799fc6765d372 (patch) | |
| tree | 4b1ef30e3865c2d2a5ad1779202e56d5de134641 /doc/design | |
| parent | cdfdc7f7b1423d2f94469ed552501cadc0f1c041 (diff) | |
| parent | 7d306afc3345b8a68dad856d930267f3d8e4cb3a (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/assistant/polls/Android_default_directory.mdwn | 2 | ||||
| -rw-r--r-- | doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index acbf48247..0da704e03 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 52 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 53 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index faa400f49..d3e1c432e 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 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 30 "Google Drive"]] +[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 31 "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 |