From 8c14cffd50baf9e1e02195c3601fa392540d3b68 Mon Sep 17 00:00:00 2001 From: Olle Johansson <oej@edvina.net> Date: Tue, 23 May 2006 11:15:57 +0000 Subject: [PATCH] Formatting, typos git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29641 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- doc/jabber.txt | 10 ++++++---- doc/jingle.txt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/jabber.txt b/doc/jabber.txt index 5889a6e360..a73f6dc526 100644 --- a/doc/jabber.txt +++ b/doc/jabber.txt @@ -1,13 +1,15 @@ (res_jabber is very experimental!) + Jabber(xmpp) is an xml based protocol primarily for presence and messaging. It is an open standard and there are several open server implementations, ejabberd, jabberd(2), wildfire, and many others, as well as several open source -clients, Psi, gajim, gaim etc. Jabber differs from otherIM applications as it -is immensly extendable. This allows us to easily integrate asterisk with -jabber. The Asterisk Jabber Interface is provided by res_jabber. res_jabber -allows for asterisk to connect to any jabber server via the standard client +clients, Psi, gajim, gaim etc. Jabber differs from other IM applications as it +is immensly extendable. This allows us to easily integrate Asterisk with +jabber. The Asterisk Jabber Interface is provided by res_jabber.so. res_jabber +allows for Asterisk to connect to any jabber server via the standard client protocol or also as a simple client. Several simple functions are exposed to the dial plan, jabberstatus, jabbersend, and soon jabberrecv. res_jabber is also used to provide the connection interface for chan_jingle. + The maintainer of res_jabber is Matthew O'Gorman <mogorman@digum.com> or mog_work on irc or prefered mogorman@astjab.org over jabber. diff --git a/doc/jingle.txt b/doc/jingle.txt index b6bdd111c1..a51d93a994 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 -- GitLab