diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn | 1 | ||||
-rw-r--r-- | doc/design/assistant/xmpp.mdwn | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn b/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn index 4cb5df545..48b30eceb 100644 --- a/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn +++ b/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn @@ -15,3 +15,4 @@ What version of git-annex are you using? On what operating system? Please provide any additional information below. +> [[done]], the name will now be sanitized. --[[Joey]] diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index c6d91c5ab..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: @@ -100,7 +100,7 @@ one or more chat messages, directed to the receiver: data </git-annex> -When `git receive-pack` edits, the receiver indicates its exit +When `git receive-pack` exits, the receiver indicates its exit status with a chat message, directed at the sender: <git-annex xmlns='git-annex' rpdone="0" /> |