aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authormogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-18 16:36:14 +0000
committermogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-18 16:36:14 +0000
commit86fb317359da86f8b397343c66efbac0c120641d (patch)
tree39305686249b2f0eee8b4a70582781601cb5fd38 /doc
parent84ff6b300b9771c3f897a67c758d7624f06163b7 (diff)
seperate jingle and gtalk so it will be easier to track
changes in both of the moving specs. Currently chan_gtalk is compatible with the latest gtalk/libjingle version, and chan_jingle needs a lot of work. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43185 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
-rw-r--r--doc/jingle.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/jingle.txt b/doc/jingle.txt
index a51d93a99..b1f20a639 100644
--- a/doc/jingle.txt
+++ b/doc/jingle.txt
@@ -1,8 +1,10 @@
(Jingle support in asterisk is experimental)
Jingle is an xmpp based protocol for signalling the transfer of media.
Currently asterisk supports the proprietary GoogleTalk protocol that is
-very similar to jingle, and hopes to support true jingle specs
+very similar to jingle, and hopes to soon support true jingle specs
(JEP-166,167,176,177,180,181 etc) as more clients support the true standard.
Jingle's configuration is very similar to sip.conf only as we are not the
jabber server in this case you must provide a connection for the peer to
travel out on.
+chan_gtalk is for supporting the non-jingle google/libjingle spec and
+chan_jingle will continue to move in the direction of the correct spec.