[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv-reviewqueue

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix conflicts

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    docs/: fix XML

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add telepathy-salut.8 man page

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix up inclusions of namespace headers

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add room-invitation protocol description

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unused ansi.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove now-useless namespaces.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename docs/room-invitation.xml to docs/clique.xml

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change OLPC activity DNS-SD records to _olpc-activity1._udp

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't check for protocol attribute, we no longer send it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change namespace in documentation to match code

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use new Clique namespace to represent the Clique protocol (XMPP-like messages over a reliable multicast protocol)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Replace some references to rMulticast with Clique

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Recommend 239.255.71.x in documentation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename NS_LLMUC to NS_TP_LL_ROOM_INVITATION and put it in the telepathy.fd.o/xmpp namespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Echo broadcast messages that are from us (rMulticast aux bytestreams don't echo)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document mDNS use for Clique

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    clique.xml: call it Clique in the intro

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use #defines for DNS-SD service types. Rename _salut-room._udp to _clique._udp