[svn-commits] seanbright: branch 1.6.0 r117793 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu May 22 10:51:04 2008
New Revision: 117793

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117793
Log:
Merged revisions 117792 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r117792 | seanbright | 2008-05-22 11:49:17 -0400 (Thu, 22 May 2008) | 1 line

Minor text fix.  roster -> resource.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/jabber.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/jabber.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/jabber.conf.sample?view=diff&rev=117793&r1=117792&r2=117793
==============================================================================
--- branches/1.6.0/configs/jabber.conf.sample (original)
+++ branches/1.6.0/configs/jabber.conf.sample Thu May 22 10:51:04 2008
@@ -7,7 +7,7 @@
 ;type=client				;;Client or Component connection
 ;serverhost=astjab.org			;;Route to server for example,
 					;;	talk.google.com
-;username=asterisk at astjab.org/asterisk	;;Username with optional roster.
+;username=asterisk at astjab.org/asterisk	;;Username with optional resource.
 ;secret=blah				;;Password
 ;priority=1				;;Resource priority
 ;port=5222				;;Port to use defaults to 5222