update todo

2 files changed, 12 insertions, 6 deletions

diff --git a/doc/design/assistant/cloud.mdwn b/doc/design/assistant/cloud.mdwn
index 18a1b3e9a..9bb8696e0 100644
--- a/doc/design/assistant/cloud.mdwn
+++ b/doc/design/assistant/cloud.mdwn
@@ -19,7 +19,7 @@ More should be added, such as:
 
 See poll at [[polls/prioritizing_special_remotes]].
 
-## The cloud notification problem
+## The cloud notification problem **done**
 
 Alice and Bob have repos, and there is a cloud remote they both share.
 Alice adds a file; the assistant transfers it to the cloud remote.
@@ -44,9 +44,9 @@ the assistant will transfer the file from the cloud to Bob.
 * pubsubhubbub does not seem like an option; its hubs want to pull down
   a feed over http.
 
-See [[xmpp]] for design of git-annex's use of xmpp for notifications.
+See [[xmpp]] for design of git-annex's use of xmpp for push notifications.
 
-## storing git repos in the cloud
+## storing git repos in the cloud **done for XMPP**
 
 Of course, one option is to just use github etc to store the git repo.
 
@@ -56,4 +56,4 @@ Two things can store git repos in Amazon S3:
 
 Another option is to not store the git repo in the cloud, but push/pull
 peer-to-peer. When peers cannot directly talk to one-another, this could be
-bounced through something like XMPP.
+bounced through something like XMPP. This is **done** for [[xmpp]]!
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn
index 80c0c57d7..b01415829 100644
--- a/doc/design/assistant/xmpp.mdwn
+++ b/doc/design/assistant/xmpp.mdwn
@@ -6,8 +6,14 @@ who share a repository, that is stored in the [[cloud]].
 
 * Prevent idle disconnection. Probably means sending or receiving pings,
   but would prefer to avoid eg pinging every 60 seconds as some clients do.
-* XMPP pairing
-* git pushes over XMPP (needed for pairing, but also awesome on their own)
+* Do git-annex clients sharing an account with regular clients cause confusing
+  things to happen? 
+  See <http://git-annex.branchable.com/design/assistant/blog/day_114__xmpp/#comment-aaba579f92cb452caf26ac53071a6788>
+* Assistant.Sync.manualPull doesn't handle XMPP remotes yet.
+  This is needed to handle getting back in sync after reconnection.
+* If a git push over XMPP is underway, and the remote client stops
+  responding, it currently blocks other git pushes from starting, forever.
+  Need a timeout..
 
 ## design goals