[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Xavier Claessens <xclaesse at gmail.com>
    Add multiple channel handlers case

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    req33, req34, req35: cancelling calls, failing to do things

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    req26..28: add use cases for recovering text chats after disconnection

  Xavier Claessens <xclaesse at gmail.com>
    use http urls as example instead of html files.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    req31..33: add use cases for recovering 1-1-chat-that-is-really-a-chatroom after disconnection

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    dis22: fix formatting

  Xavier Claessens <xclaesse at gmail.com>
    Add elisa use-case

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    dis23, dis24, dis25: miscellaneous Mission Control features

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Renumber req33 "Cancelling outgoing call" to req36 due to collision

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    req26, req28, req29, req30, req31, req33: indicate that recovering from a CM crash is equivalent to recovering from disconnection

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge dis14 and dis28 (they are actually the same use-case)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    req29..30: add use cases for recovering VoIP calls from disconnection

  Xavier Claessens <xclaesse at gmail.com>
    Automatic Text channels using BIP