]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 291938 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Fri, 15 Oct 2010 19:35:20 +0000 (19:35 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Fri, 15 Oct 2010 19:35:20 +0000 (19:35 +0000)
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/branches/1.6.2@291939 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/gtalk.conf.sample

index ad089b208cb764fd48558542d071590c77813c38..bae8e11a1eae643a6b7cb3010d406875aab9803f 100644 (file)
@@ -1,20 +1,18 @@
 ;[general]
-;context=default               ;;Context to dump call into
-;bindaddr=0.0.0.0              ;;Address to bind to
-;allowguest=yes                        ;;Allow calls from people not in
-                               ;;list of peers
-;
-;[guest]                       ;;special account for options on guest account
-;disallow=all                          
+;context=default               ; Context to dump call into
+;bindaddr=0.0.0.0              ; Address to bind to
+;allowguest=yes                        ; Allow calls from people not in list of peers
+
+;[guest]                       ; special account for options on guest account
+;disallow=all
 ;allow=ulaw
 ;context=guest
-;
+
 ;[ogorman]
-;username=ogorman@gmail.com    ;;username of the peer your 
-                               ;;calling or accepting calls from
+;username=ogorman@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.
-;
+;context=default
+;connection=asterisk           ; client or component in jabber.conf for the
+                               ; call to leave on.