[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify interaction between ListPendingMessages(clear=true) and AcknowledgePendingMessages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Let AcknowledgePendingMessages raise NetworkError (in case it's actually sending acks on the network)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In AcknowledgePendingMessages, mark up interpretation of InvalidArgument so it displays in the HTML

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify exact meaning of AcknowledgePendingMessages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Deprecate clear=true argument to ListPendingMessages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify that AcknowledgePendingMessages is the way to send message acknowledgements, in protocols that can