diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-07 16:17:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-07 16:17:08 -0400 |
| commit | 3872945f876941d75d2b188546f9dc4b305cda8c (patch) | |
| tree | 18e7d0000e832510384a8b3c02ad42f50dbcc929 | |
| parent | 7793828a844b1c5e91ea61d6beef8c1d8aaf7379 (diff) | |
| parent | 79f42fee4baf7a88414e617ada6254ddc48ed32c (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 | ||||
| -rw-r--r-- | doc/install/OSX/comment_3_b090f40fe5a32e00b472a5ab2b850b4a._comment | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 316921dd3..3e76a8c75 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 14 "Amazon S3 (done)" 9 "Amazon Glacier" 6 "Box.com" 52 "My phone (or MP3 player)" 7 "Tahoe-LAFS" 3 "OpenStack SWIFT" 14 "Google Drive"]] +[[!poll open=yes 14 "Amazon S3 (done)" 9 "Amazon Glacier" 6 "Box.com" 52 "My phone (or MP3 player)" 7 "Tahoe-LAFS" 3 "OpenStack SWIFT" 15 "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 diff --git a/doc/install/OSX/comment_3_b090f40fe5a32e00b472a5ab2b850b4a._comment b/doc/install/OSX/comment_3_b090f40fe5a32e00b472a5ab2b850b4a._comment new file mode 100644 index 000000000..a437704a3 --- /dev/null +++ b/doc/install/OSX/comment_3_b090f40fe5a32e00b472a5ab2b850b4a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.149" + subject="comment 3" + date="2012-10-06T21:05:45Z" + content=""" +@Douglas, I've fixed that in git. FWIW, the program is installed before that point. Actually, I am leaning toward not having cabal install that plist file at all. +"""]] |