[asterisk-commits] trunk r29641 - in /trunk/doc: jabber.txt jingle.txt

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue May 23 06:15:57 2006
New Revision: 29641

URL: http://svn.digium.com/view/asterisk?rev=29641&view=rev
Log:
Formatting, typos

Modified:
    trunk/doc/jabber.txt
    trunk/doc/jingle.txt

Modified: trunk/doc/jabber.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/jabber.txt?rev=29641&r1=29640&r2=29641&view=diff
==============================================================================
--- trunk/doc/jabber.txt (original)
+++ trunk/doc/jabber.txt Tue May 23 06:15:57 2006
@@ -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 at digum.com> or
 mog_work on irc or prefered mogorman at astjab.org over jabber.

Modified: trunk/doc/jingle.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/jingle.txt?rev=29641&r1=29640&r2=29641&view=diff
==============================================================================
--- trunk/doc/jingle.txt (original)
+++ trunk/doc/jingle.txt Tue May 23 06:15:57 2006
@@ -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