[muji/master] Rename Mingle to Muji everywhere
Sjoerd Simons
sjoerd.simons at collabora.co.uk
Tue Jun 2 10:58:04 PDT 2009
---
xep/Makefile | 2 +-
xep/{mingle.xml => muji.xml} | 42 +++++++++++++++++++++---------------------
2 files changed, 22 insertions(+), 22 deletions(-)
rename xep/{mingle.xml => muji.xml} (84%)
diff --git a/xep/Makefile b/xep/Makefile
index 82ca1c9..e76f4a4 100644
--- a/xep/Makefile
+++ b/xep/Makefile
@@ -1,4 +1,4 @@
-mingle.html: mingle.xml
+muji.html: muji.xml
xsltproc $< > $@
diff --git a/xep/mingle.xml b/xep/muji.xml
similarity index 84%
rename from xep/mingle.xml
rename to xep/muji.xml
index 182b43e..c1f092e 100644
--- a/xep/mingle.xml
+++ b/xep/muji.xml
@@ -6,13 +6,13 @@
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
<xep>
<header>
- <title>Mingle</title>
+ <title>Muji</title>
<abstract>
This specification defines an XMPP protocol extension for initiating and
managing multiparty voice and video conferences within an XMPP MUC
</abstract>
&LEGALNOTICE;
- <number>proto-mingle0.1</number>
+ <number>proto-muji0.1</number>
<status>ProtoXep</status>
<type>Extension</type>
<sig>Standards</sig>
@@ -24,7 +24,7 @@
</dependencies>
<supersedes/>
<supersededby/>
- <shortname>mingle</shortname>
+ <shortname>muji</shortname>
<author>
<firstname>Sjoerd</firstname>
<surname>Simons</surname>
@@ -45,12 +45,12 @@
</header>
<section1 topic='Introduction' anchor='intro'>
Jingle <cite>XEP-0166</cite> is used to negotiate peer to peer media sessions.
-Mingle is a way to coordinate Jingle sessions between a group of people.
-Mingle conferences are held in <cite>XEP-0045</cite> rooms.
+Muji is a way to coordinate Jingle sessions between a group of people.
+Muji conferences are held in <cite>XEP-0045</cite> rooms.
</section1>
<section1 topic="How it works" anchor="howitworks">
-A Mingle conference has a number of contents, each of which has unique name.
+A Muji conference has a number of contents, each of which has unique name.
content type, and an encoding. Each participant may provide a stream for each
content, and communicates which contents they are willing to provide streams
for, along with encoding information, in their MUC presence. This serves two
@@ -61,24 +61,24 @@ payload each content that they provide once.
Participants can participate in a read-only mode by not advertising any
contents. Participants are not required to participate all the contents that
-are available. For example, a Mingle client might choose to only request audio
+are available. For example, a Muji client might choose to only request audio
streams.
</section1>
<section1 topic='Starting a conference' anchor='starting'>
<!-- TODO better conflict handling -->
- Assuming there is no existing Mingle conference in the <cite>XEP-0045</cite>
- room a new conference can be started by a user putting a Mingle stanza with
+ Assuming there is no existing Muji conference in the <cite>XEP-0045</cite>
+ room a new conference can be started by a user putting a Muji stanza with
the proposed contents in its presence. As shown in the example below:
<code><![CDATA[
<presence from='wiccarocks at shakespeare.lit/laptop'
to='darkcave at chat.shakespeare.lit/oldhag'>
<c xmlns="http://jabber.org/protocol/caps"
- node="http://telepathy.freedesktop.org/wiki/Mingle"
+ node="http://telepathy.freedesktop.org/wiki/Muji"
ver="48QdBuXRCJFb8qIzgy1FOHSGO0U="
hash="sha-1" />
- <mingle xmlns='http://telepathy.freedesktop.org/mingle'>
+ <muji xmlns='http://telepathy.freedesktop.org/muji'>
<content name='video'>
<description xmlns='urn:xmpp:jingle:apps:rtp:0' media='video'>
<payload-type id='98' name='theora' clockrate='90000'/>
@@ -90,7 +90,7 @@ streams.
<payload-type id='18' name='G729'/>
</description>
</content>
- </mingle>
+ </muji>
</presence>
]]></code>
@@ -100,17 +100,17 @@ streams.
<section1 topic='Joining a conference' anchor='starting'>
<p>
- A client that is a member of a MUC joins a Mingle conference by first
- updating their MUC presence with a Mingle stanza reflecting the contents
+ A client that is a member of a MUC joins a Muji conference by first
+ updating their MUC presence with a Muji stanza reflecting the contents
they want to provide.
</p>
<p>
- A Mingle client MUST NOT advertise Mingle capabilities in their MUC presence
+ A Muji client MUST NOT advertise Muji capabilities in their MUC presence
before they have received MUC presence from every other participant in the
MUC, because otherwise they cannot reliably create a payload type mapping
that's compatible with those of the existing participants. This means that
- the initial MUC presence must not contain Mingle data.
+ the initial MUC presence must not contain Muji data.
</p>
<p>
@@ -141,13 +141,13 @@ streams.
<p>
Jingle sessions are initiated between the MUC JIDs of participants. That is,
the Jingle session-intiate stanza is sent from one MUC JID to another. This
- allows participants to easily identify sessions as belonging to a Mingle
- conference. Content names inside Mingle-related Jingle sessions always refer
- to the content with the same name inside the Mingle conference.
+ allows participants to easily identify sessions as belonging to a Muji
+ conference. Content names inside Muji-related Jingle sessions always refer
+ to the content with the same name inside the Muji conference.
</p>
<p>
- To leave a conference first the Mingle information, presence MUST first be
+ To leave a conference first the Muji information, presence MUST first be
removed from the participant's presence; subsequently it SHOULD terminate
all Jingle sessions related to that conference. Updating the presence first
reduces the likelihood of situations where new participants initiate
@@ -157,7 +157,7 @@ streams.
<section1 topic='TODO' anchor='TODO'>
<ul>
- <li> There is a race when two participants try to start a new Mingle
+ <li> There is a race when two participants try to start a new Muji
conference at the same time. This can be solves by making the initial
conference announceemnt two stage and relying on the fact that messages
are ordered to be the arbiter. (Note: actually find out if presence is
--
1.5.6.5
More information about the telepathy-commits
mailing list