summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-14 13:17:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-01-14 13:17:42 -0400
commit305226f48fe802bb69c52434a44503624b5d52d9 (patch)
tree997e07efd9090e4f006f289511ffc991a97c542e
parentc7630821b863cf0805356298c81845dbeced8b3a (diff)
some corrections
-rw-r--r--doc/design/assistant/xmpp.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn
index d9975e82d..3ebcc0e8a 100644
--- a/doc/design/assistant/xmpp.mdwn
+++ b/doc/design/assistant/xmpp.mdwn
@@ -76,15 +76,15 @@ to each known client of each XMPP remote.
To request that a remote push to us, a chat message can be sent.
- <git-annex xmlns='git-annex' pushrequest="uuid" />
+ <git-annex xmlns='git-annex' pushrequest="" />
-When replying to an xmpppush message, this is directed at the specific
+When replying to an canpush message, this is directed at the specific
client that indicated it could push. To solicit pushes from all clients,
-the message has to be sent directed indiviaually to each client.
+the message has to be sent directed individually to each client.
When a peer is ready to send a git push, it sends:
- <git-annex xmlns='git-annex' startingpush="uuid" />
+ <git-annex xmlns='git-annex' startingpush="" />
The receiver runs `git receive-pack`, and sends back its output in
one or more chat messages, directed to the client that is pushing: