[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/telepathy-spec-smcv-reduced

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Interface_Hold: rethink the interface:
* per channel rather than per member
* GetHoldState can't fail (therefore shouldn't involve round trips)
* Channel_Hold_State is None/Local/Remote/Both rather than None/Send/Recv/Both
  (since whoever initiated the hold, it should stop streaming in both
  directions)
* Clarify the purpose and meaning

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't cross-reference to Channel_Hold_State in the text now that the markup indicates it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove duplicate copy of Channel_Hold_State and re-indent

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Interface_Hold: copyright 2008

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Re-word Channel_Hold_State values: it's the call that's placed on hold, and not members

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Channel_Interface_Call_Merging

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add docstring for Channel_Hold_State

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    all.xml: copyright 2008