[asterisk-commits] pabelanger: trunk r291941 - in /trunk: ./ configs/gtalk.conf.sample

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Oct 15 14:53:06 2010
New Revision: 291941

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=291941
Log:
Merged revisions 291940 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291940 | pabelanger | 2010-10-15 15:50:22 -0400 (Fri, 15 Oct 2010) | 16 lines
  
  Merged revisions 291939 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r291939 | pabelanger | 2010-10-15 15:35:20 -0400 (Fri, 15 Oct 2010) | 9 lines
    
    Merged revisions 291938 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct 2010) | 2 lines
      
      Clean up formatting.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/configs/gtalk.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/gtalk.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/gtalk.conf.sample?view=diff&rev=291941&r1=291940&r2=291941
==============================================================================
--- trunk/configs/gtalk.conf.sample (original)
+++ trunk/configs/gtalk.conf.sample Fri Oct 15 14:53:06 2010
@@ -1,25 +1,22 @@
 ;[general]
-;context=default     ;Context to dump call into
-;bindaddr=0.0.0.0    ;Address to bind to
-;externip=127.0.0.1  ;Set your external ip if you are behind a NAT.
+;context=default		; Context to dump call into
+;bindaddr=0.0.0.0		; Address to bind to
+;externip=127.0.0.1		; Set your external ip if you are behind a NAT.
+;stunaddr=mystunserver.com	; Get your external ip from a STUN server.
+				; Note, if the STUN query is successful, this will
+				; replace any value placed in externip;
+;allowguest=yes			; Allow calls from people not in list of peers
 
-;stunaddr=mystunserver.com ; Get your external ip from a STUN server.
-                           ; Note, if the STUN query is successful, this will
-                           ; replace any value placed in externip;
-;allowguest=yes    ;Allow calls from people not in
-                   ;list of peers
-;
-;[guest]        ;special account for options on guest account
+;[guest]			; special account for options on guest account
 ;disallow=all
 ;allow=ulaw
 ;context=guest
-;
+
 ;[ogorman]
-;username=ogorman at gmail.com ;username of the peer your
-                            ;calling or accepting calls from
+;username=ogorman at gmail.com	; username of the peer your 
+				; calling or accepting calls from
 ;disallow=all
 ;allow=ulaw
 ;context=default
-;connection=asterisk   ;client or component in jabber.conf
-                       ;for the call to leave on.
-;
+;connection=asterisk		; client or component in jabber.conf for the
+				; call to leave on.