From 85c52c4029b7228872c2dcfd182fe69e63e3e7dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Nov 2012 15:52:03 -0400 Subject: [PATCH] clean up protocol docs --- doc/design/assistant/xmpp.mdwn | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index 284e56fa3b..3c88640216 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -36,18 +36,23 @@ To these messages, it adds its own tag as [extended content](http://xmpp.org/rfcs/rfc6121.html#presence-extended). The xml namespace is "git-annex" (not an URL because I hate wasting bandwidth). -To indicate it's pushed changes to a git repo with a given UUID, -a message that should be sent to all buddies and other clients using the account -(no explicit pairing needed), a client uses a broadcast presence message with: +To indicate it's pushed changes to a git repo with a given UUID, a message +that should be sent to all buddies and other clients using the account (no +explicit pairing needed), it uses a broadcast presence message containing: Multiple UUIDs can be listed when multiple clients were pushed. If the git repo does not have a git-annex UUID, an empty string is used. -For pairing, a chat message is sent, also using the git-annex tag: +To query if other git-annex clients are around, a presence message is used, +containing: - + + +For pairing, a chat message is sent, containing: + + ### security