diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-15 19:35:20 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-15 19:35:20 +0000 |
| commit | 6822bc288591663dc46e47880fdf0fecc871c3ed (patch) | |
| tree | b63c4940cff7477356cf3959661f6d1a0a3e61c7 | |
| parent | 8ae20dcd9d40b90cf1830b1d75d0286cfa9c9ca0 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@291939 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | configs/gtalk.conf.sample | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/configs/gtalk.conf.sample b/configs/gtalk.conf.sample index ad089b208..bae8e11a1 100644 --- a/configs/gtalk.conf.sample +++ b/configs/gtalk.conf.sample @@ -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. |