2 files changed, 12 insertions, 9 deletions
diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn
index 3b427b42f..2ecf9ec71 100644
--- a/doc/design/assistant/telehash.mdwn
+++ b/doc/design/assistant/telehash.mdwn
@@ -83,7 +83,7 @@ Advantages:
   exchange protocols implemented in such a daemon to allow SSH-less
   transfers.
 * Security holes in telehash would not need to compromise the entire
-  git-annex. gathd could be sandboxed in one way or another.
+  git-annex. daemon could be sandboxed in one way or another.
 
 Disadvantages:
 
diff --git a/doc/design/git-remote-daemon.mdwn b/doc/design/git-remote-daemon.mdwn
index 6b8e0646f..ca3a59fce 100644
--- a/doc/design/git-remote-daemon.mdwn
+++ b/doc/design/git-remote-daemon.mdwn
@@ -69,24 +69,28 @@ the webapp.
 
 ## emitted messages
 
-* `CONNECTED $remote`
+* `CONNECTED uri`
 
   Sent when a connection has been made with a remote.
 
-* `DISCONNECTED $remote`
+* `DISCONNECTED uri`
 
   Sent when connection with a remote has been lost.
 
-* `SYNCING $remote`
+* `SYNCING uri`
 
   Indicates that a pull or a push with a remote is in progress.
   Always followed by DONESYNCING.
 
-* `DONESYNCING 1|0 $remote`
+* `DONESYNCING uri 1|0`
 
   Indicates that syncing with a remote is done, and either succeeded
   (1) or failed (0).
 
+* `WARNING uri string`
+
+  A message to display to the user about a remote.
+
 ## consumed messages
 
 * `PAUSE`
@@ -160,13 +164,12 @@ No pushing is done for CHANGED, since git handles ssh natively.
 
 TODO:
 
+* The NetWatcher does not detect network loss, only network gain,
+  so PAUSE is only sent when a new network is detected, followed
+  immediately by RESUME.
 * Remote system might not be available. Find a smart way to detect it,
   ideally w/o generating network traffic. One way might be to check
   if the ssh connection caching control socket exists, for example.
-* Remote system might be available, and connection get lost. Should
-  reconnect, but needs to avoid bad behavior (ie, constant reconnect
-  attempts.)
-* Detect if old system had a too old git-annex-shell and avoid bad behavior
 
 ## telehash