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.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-10-15 19:53:06 +00:00
parent 45fb4df288
commit 5c695396a7

View File

@@ -1,25 +1,22 @@
;[general] ;[general]
;context=default ;Context to dump call into ;context=default ; Context to dump call into
;bindaddr=0.0.0.0 ;Address to bind to ;bindaddr=0.0.0.0 ; Address to bind to
;externip=127.0.0.1 ;Set your external ip if you are behind a NAT. ;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. ;[guest] ; special account for options on guest account
; 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
;disallow=all ;disallow=all
;allow=ulaw ;allow=ulaw
;context=guest ;context=guest
;
;[ogorman] ;[ogorman]
;username=ogorman@gmail.com ;username of the peer your ;username=ogorman@gmail.com ; username of the peer your
;calling or accepting calls from ; calling or accepting calls from
;disallow=all ;disallow=all
;allow=ulaw ;allow=ulaw
;context=default ;context=default
;connection=asterisk ;client or component in jabber.conf ;connection=asterisk ; client or component in jabber.conf for the
;for the call to leave on. ; call to leave on.
;