summaryrefslogtreecommitdiff
path: root/doc/design/assistant/xmpp.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-07 16:59:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-07 16:59:18 -0400
commitdd588893b7f1ec2c54671dfb8c1166ffa8378ecf (patch)
tree725f67db56374ba8639a78092ea733a9cfd3bd62 /doc/design/assistant/xmpp.mdwn
parent9f852ca6bf4c6666c92becf8bd78f89ba9fddcf9 (diff)
data types and xml generation/parsing for xmpp push
Diffstat (limited to 'doc/design/assistant/xmpp.mdwn')
-rw-r--r--doc/design/assistant/xmpp.mdwn10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn
index 84d3a5c0e..dafa709db 100644
--- a/doc/design/assistant/xmpp.mdwn
+++ b/doc/design/assistant/xmpp.mdwn
@@ -58,7 +58,7 @@ For pairing, a chat message is sent, containing:
To request that a peer push to us, a chat message can be sent:
- <git-annex xmlns='git-annex' startpush="" />
+ <git-annex xmlns='git-annex' pushrequest="" />
When a peer is ready to send a git push, it sends:
@@ -67,11 +67,15 @@ When a peer is ready to send a git push, it sends:
The receiver runs `git receive-pack`, and sends back its output in
one or more chat messages:
- <git-annex xmlns='git-annex' rp="007b27ca394d26a05d9b6beefa1b07da456caa2157d7 refs/heads/git-annex report-status delete-refs side-band-64k quiet ofs-delta" />
+ <git-annex xmlns='git-annex' rp="">
+ 007b27ca394d26a05d9b6beefa1b07da456caa2157d7 refs/heads/git-annex report-status delete-refs side-band-64k quiet ofs-delta
+ </git-annex>
The sender replies with the data from `git push`:
- <git-annex xmlns='git-annex' sp="data" />
+ <git-annex xmlns='git-annex' sp="">
+ data
+ </git-annex>
When `git receive-pack` edits, the receiver indicates its exit
status: