[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/tp-spec-smcv-text

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow rationale to be mixed in with HTML in docstrings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow arrays of mappings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Text: explain the Action message type better

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Text: clarify semantics of Send, Sent, SendError based on Rob's explanation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Amend Text interface so Send emits Sent at the time that it returns, and SendError can only be emitted later.
This directly contradicts the interface docstring in previous spec versions
(up to 0.17.2), but agrees with what Gabble and Haze implement in practice.