summaryrefslogtreecommitdiff
path: root/doc/jingle.txt
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-05-23 11:15:57 +0000
committerOlle Johansson <oej@edvina.net>2006-05-23 11:15:57 +0000
commit8c14cffd50baf9e1e02195c3601fa392540d3b68 (patch)
treea923d7f5fa33eaa62e3f5eb45772c1e6e1c367b3 /doc/jingle.txt
parentfa9e0ed7688b2153a15a691e3c620a35dcb287a8 (diff)
Formatting, typos
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'doc/jingle.txt')
-rw-r--r--doc/jingle.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/jingle.txt b/doc/jingle.txt
index b6bdd111c..a51d93a99 100644
--- a/doc/jingle.txt
+++ b/doc/jingle.txt
@@ -1,6 +1,6 @@
(Jingle support in asterisk is experimental)
Jingle is an xmpp based protocol for signalling the transfer of media.
-Currently asterisk supports the propitery GoogleTalk protocol that is
+Currently asterisk supports the proprietary GoogleTalk protocol that is
very similar to jingle, and hopes to 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