6 files changed, 29 insertions, 5 deletions
diff --git a/doc/bugs/Cabal_cannot_solve_dependencies.mdwn b/doc/bugs/Cabal_cannot_solve_dependencies.mdwn
index f4f5bc3d1..ac9738b03 100644
--- a/doc/bugs/Cabal_cannot_solve_dependencies.mdwn
+++ b/doc/bugs/Cabal_cannot_solve_dependencies.mdwn
@@ -31,3 +31,6 @@ yesod-core>=0.9.4 && <0.10)
 rejecting: yesod-default-0.4.1, 0.4.0, 0.3.1 (conflict: yesod-core==1.2.1,
 yesod-default => yesod-core>=0.9 && <0.10
 """]]
+
+> At the risk of closing early again, I have uploaded a .2 with
+> hints for the version of yesod-form and yesod-static. [[done]] --[[Joey]] 
diff --git a/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn b/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn
index fd0eba9ab..bb340231f 100644
--- a/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn
+++ b/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn
@@ -18,3 +18,5 @@ add an rsync.net repo
 
 # End of transcript or log.
 """]]
+
+> [[done]]; the OSX gpg was broken for a while, now fixed. --[[Joey]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 9554f15aa..29a5a6225 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -247,6 +247,11 @@ subdirectories).
   (or encryption=emailaddress) to specify a gpg key that can access
   the encrypted special remote.
 
+  Note that with encryption enabled, a gpg key is created. This requires
+  sufficient entropy. If initremote seems to hang or take a long time
+  while generating the key, you may want to ctrl-c it and re-run with --fast,
+  which causes it to use a lower-quality source of randomness.
+
   Example Amazon S3 remote:
 
 	git annex initremote mys3 type=S3 encryption=me@example.com datacenter=EU
diff --git a/doc/templates/bugtemplate.mdwn b/doc/templates/bugtemplate.mdwn
index 1f33a1cb8..6214e8f74 100644
--- a/doc/templates/bugtemplate.mdwn
+++ b/doc/templates/bugtemplate.mdwn
@@ -11,7 +11,7 @@
 
 [[!format sh """
 # If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
 
 
 # End of transcript or log.
diff --git a/doc/todo/support_for_writing_external_special_remotes.mdwn b/doc/todo/support_for_writing_external_special_remotes.mdwn
index eab0c5dff..2d7cd9d15 100644
--- a/doc/todo/support_for_writing_external_special_remotes.mdwn
+++ b/doc/todo/support_for_writing_external_special_remotes.mdwn
@@ -1,13 +1,25 @@
-It would be good to have something in between the hook special remote and the built-in special remotes.
-The hook is easy to set up, but its simple interface misses some features that a more full-features interface could provide to a third-party program that wants to provide the best possible special remote it can w/o being written in haskell:
+It would be good to have something in between the hook special remote and
+the built-in special remotes. The hook is easy to set up, but its simple
+interface misses some features that a more full-features interface could
+provide to a third-party program that wants to provide the best possible
+special remote it can w/o being written in haskell:
 
 * No way to send progress updates when uploading, so no progress bars for uploads from hook special remotes in the webapp.
 * No way to verify the `initremote` parameters include all needed configuration, and do any initalization needed.
 * No way to query and/or set the remote.log while it's running. (Well, technically, `git annex enableremote` can set values..)
 * No way to store per-key information to the git-annex branch.
+* No (easy) way to split files into chunks.
 
-These features could be added to git-annex as subcommands. Which would improve the general programmability and flexability of git-annex. OTOH, running `git-annex upload-progress` repeatedly is pretty ugly. Or the interface could provide a channel for the program and git-annex to communicate back and forth on. Maybe a mix of the two?
+Some of these features could be added to git-annex as subcommands. Which would
+improve the general programmability and flexability of git-annex. OTOH,
+running `git-annex upload-progress` repeatedly is pretty ugly. Or the
+interface could provide a channel for the program and git-annex to
+communicate back and forth on. Maybe a mix of the two?
 
-A final feature such an interface should provide is the ability to drop a program into PATH and have it just work, without the user needing to do any configuration beyond `initremote`. So, `git annex initremote foo type=$bar` should look for `git-annex-remote-$bar` in PATH if that's not a built-in special remote name.
+A final feature such an interface should provide is the ability to drop a
+program into PATH and have it just work, without the user needing to do any
+configuration beyond `initremote`. So, `git annex initremote foo type=$bar`
+should look for `git-annex-remote-$bar` in PATH if that's not a built-in
+special remote name.
 
 --[[Joey]]
diff --git a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn b/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
index 268bc9ff7..96552eecc 100644
--- a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
+++ b/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
@@ -3,3 +3,5 @@ It would be very nice with an "advanced settings" for jabber and webdav support.
 Currently XMPP fails if you use a google apps account. Since the domain provided in the email is not the same as the XMPP server.
 
 Same goes for webdav support. If i have my own webdav server somewhere on the internet there is no way to set it up in the assistant.
+
+[[!tag /design/assistant]]