[asterisk-commits] russell: branch group/bindings r197614 - in /team/group/bindings: ./ apps/ co...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 28 10:34:57 CDT 2009
Author: russell
Date: Thu May 28 10:34:45 2009
New Revision: 197614
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197614
Log:
resolve, reset
Modified:
team/group/bindings/ (props changed)
team/group/bindings/apps/app_chanspy.c
team/group/bindings/configs/agents.conf.sample
team/group/bindings/configs/ais.conf.sample
team/group/bindings/configs/alarmreceiver.conf.sample
team/group/bindings/configs/asterisk.adsi
team/group/bindings/configs/cdr.conf.sample
team/group/bindings/configs/chan_dahdi.conf.sample
team/group/bindings/configs/cli_aliases.conf.sample
team/group/bindings/configs/console.conf.sample
team/group/bindings/configs/dundi.conf.sample
team/group/bindings/configs/extconfig.conf.sample
team/group/bindings/configs/extensions.ael.sample
team/group/bindings/configs/extensions.conf.sample
team/group/bindings/configs/extensions.lua.sample
team/group/bindings/configs/extensions_minivm.conf.sample
team/group/bindings/configs/features.conf.sample
team/group/bindings/configs/festival.conf.sample
team/group/bindings/configs/followme.conf.sample
team/group/bindings/configs/gtalk.conf.sample
team/group/bindings/configs/h323.conf.sample
team/group/bindings/configs/http.conf.sample
team/group/bindings/configs/iax.conf.sample
team/group/bindings/configs/iaxprov.conf.sample
team/group/bindings/configs/indications.conf.sample
team/group/bindings/configs/jingle.conf.sample
team/group/bindings/configs/logger.conf.sample
team/group/bindings/configs/manager.conf.sample
team/group/bindings/configs/meetme.conf.sample
team/group/bindings/configs/mgcp.conf.sample
team/group/bindings/configs/minivm.conf.sample
team/group/bindings/configs/modules.conf.sample
team/group/bindings/configs/musiconhold.conf.sample
team/group/bindings/configs/osp.conf.sample
team/group/bindings/configs/oss.conf.sample
team/group/bindings/configs/phone.conf.sample
team/group/bindings/configs/phoneprov.conf.sample
team/group/bindings/configs/queuerules.conf.sample
team/group/bindings/configs/queues.conf.sample
team/group/bindings/configs/res_odbc.conf.sample
team/group/bindings/configs/res_snmp.conf.sample
team/group/bindings/configs/rpt.conf.sample
team/group/bindings/configs/rtp.conf.sample
team/group/bindings/configs/say.conf.sample
team/group/bindings/configs/sip.conf.sample
team/group/bindings/configs/skinny.conf.sample
team/group/bindings/configs/sla.conf.sample
team/group/bindings/configs/unistim.conf.sample
team/group/bindings/configs/users.conf.sample
team/group/bindings/configs/voicemail.conf.sample
team/group/bindings/include/asterisk/audiohook.h
team/group/bindings/main/audiohook.c
team/group/bindings/main/logger.c
team/group/bindings/main/utils.c
Propchange: team/group/bindings/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 28 10:34:45 2009
@@ -1,1 +1,1 @@
-/trunk:1-197482
+/trunk:1-197612
Modified: team/group/bindings/apps/app_chanspy.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_chanspy.c?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/apps/app_chanspy.c (original)
+++ team/group/bindings/apps/app_chanspy.c Thu May 28 10:34:45 2009
@@ -455,6 +455,7 @@
ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan_name, autochan->chan->name);
+ ast_set_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC | AST_AUDIOHOOK_SMALL_QUEUE);
res = ast_audiohook_attach(autochan->chan, audiohook);
if (!res && ast_test_flag(autochan->chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(autochan->chan))) {
Modified: team/group/bindings/configs/agents.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/agents.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/agents.conf.sample (original)
+++ team/group/bindings/configs/agents.conf.sample Thu May 28 10:34:45 2009
@@ -32,14 +32,14 @@
; Define autologoffunavail to have agents automatically logged
; out when the extension that they are at returns a CHANUNAVAIL
; status when a call is attempted to be sent there.
-; Default is "no".
+; Default is "no".
;
;autologoffunavail=yes
;
; Define ackcall to require a DTMF acknowledgement when
; an agent logs in using agentcallbacklogin. Default is "no".
; Can also be set to "always", which will also require AgentLogin
-; agents to acknowledge calls. Use the acceptdtmf option to
+; agents to acknowledge calls. Use the acceptdtmf option to
; configure what DTMF key press should be used to acknowledge the
; call. The default is '#'.
;
@@ -70,14 +70,14 @@
;
;goodbye => goodbye_file
;
-; Define updatecdr. This is whether or not to change the source
-; channel in the CDR record for this call to agent/agent_id so
+; Define updatecdr. This is whether or not to change the source
+; channel in the CDR record for this call to agent/agent_id so
; that we know which agent generates the call
;
;updatecdr=no
;
; Group memberships for agents (may change in mid-file)
-;
+;
;group=3
;group=1,2
;group=
@@ -85,7 +85,7 @@
; --------------------------------------------------
; This section is devoted to recording agent's calls
; The keywords are global to the chan_agent channel driver
-;
+;
; Enable recording calls addressed to agents. It's turned off by default.
;recordagentcalls=yes
;
@@ -100,7 +100,7 @@
; /var/spool/asterisk/monitor
;savecallsin=/var/calls
;
-; An optional custom beep sound file to play to always-connected agents.
+; An optional custom beep sound file to play to always-connected agents.
;custom_beep=beep
;
; --------------------------------------------------
Modified: team/group/bindings/configs/ais.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/ais.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/ais.conf.sample (original)
+++ team/group/bindings/configs/ais.conf.sample Thu May 28 10:34:45 2009
@@ -1,5 +1,5 @@
;
-; Sample configuration file for res_ais
+; Sample configuration file for res_ais
; * SAForum AIS (Application Interface Specification)
;
; More information on the AIS specification is available from the SAForum.
@@ -76,7 +76,7 @@
;
; This example would be used for a node that has phones directly registered
; to it, but does not have direct access to voicemail. So, this node wants
-; to be informed about MWI state changes on other voicemail server nodes, but
+; to be informed about MWI state changes on other voicemail server nodes, but
; is not capable of publishing any state changes.
;
; [mwi]
Modified: team/group/bindings/configs/alarmreceiver.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/alarmreceiver.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/alarmreceiver.conf.sample (original)
+++ team/group/bindings/configs/alarmreceiver.conf.sample Thu May 28 10:34:45 2009
@@ -7,10 +7,10 @@
[general]
-;
+;
; Specify a timestamp format for the metadata section of the event files
; Default is %a %b %d, %Y @ %H:%M:%S %Z
-
+
timestampformat = %a %b %d, %Y @ %H:%M:%S %Z
;
@@ -32,7 +32,7 @@
eventspooldir = /tmp
-;
+;
; The alarmreceiver app can either log the events one-at-a-time to individual
; files in the spool directory, or it can store them until the caller
; disconnects and write them all to one file.
@@ -46,7 +46,7 @@
; The timeout for receiving the first DTMF digit is adjustable from 1000 msec.
; to 10000 msec. The default is 2000 msec. Note: if you wish to test the
; receiver by entering digits manually, set this to a reasonable time out
-; like 10000 milliseconds.
+; like 10000 milliseconds.
fdtimeout = 2000
@@ -54,7 +54,7 @@
; The timeout for receiving subsequent DTMF digits is adjustable from
; 110 msec. to 4000 msec. The default is 200 msec. Note: if you wish to test
; the receiver by entering digits manually, set this to a reasonable time out
-; like 4000 milliseconds.
+; like 4000 milliseconds.
;
sdtimeout = 200
Modified: team/group/bindings/configs/asterisk.adsi
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/asterisk.adsi?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/asterisk.adsi (original)
+++ team/group/bindings/configs/asterisk.adsi Thu May 28 10:34:45 2009
@@ -86,10 +86,10 @@
IFEVENT OFFHOOK THEN
CLEAR
CLEARFLAG "nocallwaiting"
- CLEARDISPLAY
+ CLEARDISPLAY
SHOWDISPLAY "titles" AT 1
- SHOWKEYS "vmail"
- SHOWKEYS "cidblock"
+ SHOWKEYS "vmail"
+ SHOWKEYS "cidblock"
SHOWKEYS "cwdisable" UNLESS "nocallwaiting"
GOTO "offHook"
ENDIF
@@ -117,9 +117,9 @@
SHOWKEYS "vmail_OH"
ENDIF
IFEVENT TIMER THEN
- CLEAR
+ CLEAR
SHOWDISPLAY "empty" AT 4
- ENDIF
+ ENDIF
ENDSUB
SUB "offHook" IS
Modified: team/group/bindings/configs/cdr.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/cdr.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/cdr.conf.sample (original)
+++ team/group/bindings/configs/cdr.conf.sample Thu May 28 10:34:45 2009
@@ -14,12 +14,12 @@
;enable=yes
; Define whether or not to log unanswered calls. Setting this to "yes" will
-; report every attempt to ring a phone in dialing attempts, when it was not
+; report every attempt to ring a phone in dialing attempts, when it was not
; answered. For example, if you try to dial 3 extensions, and this option is "yes",
; you will get 3 CDR's, one for each phone that was rung. Default is "no". Some
; find this information horribly useless. Others find it very valuable. Note, in "yes"
; mode, you will see one CDR, with one of the call targets on one side, and the originating
-; channel on the other, and then one CDR for each channel attempted. This may seem
+; channel on the other, and then one CDR for each channel attempted. This may seem
; redundant, but cannot be helped.
;unanswered = no
@@ -67,7 +67,7 @@
; Normally, the 'billsec' field logged to the backends (text files or databases)
; is simply the end time (hangup time) minus the answer time in seconds. Internally,
-; asterisk stores the time in terms of microseconds and seconds. By setting
+; asterisk stores the time in terms of microseconds and seconds. By setting
; initiatedseconds to 'yes', you can force asterisk to report any seconds
; that were initiated (a sort of round up method). Technically, this is
; when the microsecond part of the end time is greater than the microsecond
@@ -78,12 +78,12 @@
;
; CHOOSING A CDR "BACKEND" (what kind of output to generate)
;
-; To choose a backend, you have to make sure either the right category is
-; defined in this file, or that the appropriate config file exists, and has the
+; To choose a backend, you have to make sure either the right category is
+; defined in this file, or that the appropriate config file exists, and has the
; proper definitions in it. If there are any problems, usually, the entry will
; silently ignored, and you get no output.
-;
-; Also, please note that you can generate CDR records in as many formats as you
+;
+; Also, please note that you can generate CDR records in as many formats as you
; wish. If you configure 5 different CDR formats, then each event will be logged
; in 5 different places! In the example config files, all formats are commented
; out except for the cdr-csv format.
@@ -104,7 +104,7 @@
; backend is marked with XXX, you know that the "configure" command could not find
; the required libraries for that option.
;
-; To get CDRs to be logged to the plain-jane /var/log/asterisk/cdr-csv/Master.csv
+; To get CDRs to be logged to the plain-jane /var/log/asterisk/cdr-csv/Master.csv
; file, define the [csv] category in this file. No database necessary. The example
; config files are set up to provide this kind of output by default.
;
@@ -126,7 +126,7 @@
; shows that the modules are available, and the cdr_pgsql.conf file exists, and
; has a [global] section with the proper variables defined.
;
-; For logging to radius databases, make sure all the proper libs are installed, that
+; For logging to radius databases, make sure all the proper libs are installed, that
; "make menuselect" shows that the modules are available, and the [radius]
; category is defined in this file, and in that section, make sure the 'radiuscfg'
; variable is properly pointing to an existing radiusclient.conf file.
@@ -135,7 +135,7 @@
; which is usually /var/log/asterisk. Of course, the proper libraries should be available
; during the 'configure' operation.
;
-; For tds logging, make sure the proper libraries are available during the 'configure'
+; For tds logging, make sure the proper libraries are available during the 'configure'
; phase, and that cdr_tds.conf exists and is properly set up with a [global] category.
;
; Also, remember, that if you wish to log CDR info to a database, you will have to define
Modified: team/group/bindings/configs/chan_dahdi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/chan_dahdi.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/chan_dahdi.conf.sample (original)
+++ team/group/bindings/configs/chan_dahdi.conf.sample Thu May 28 10:34:45 2009
@@ -6,7 +6,7 @@
; will reload the configuration file, but not all configuration options
; are re-configured during a reload (signalling, as well as PRI and
; SS7-related settings cannot be changed on a reload).
-;
+;
; This file documents many configuration variables. Normally unless you know
; what a variable means or that it should be changed, there's no reason to
; un-comment those lines.
@@ -21,11 +21,11 @@
;
; Trunk groups are used for NFAS or GR-303 connections.
;
-; Group: Defines a trunk group.
+; Group: Defines a trunk group.
; trunkgroup => <trunkgroup>,<dchannel>[,<backup1>...]
;
; trunkgroup is the numerical trunk group to create
-; dchannel is the DAHDI channel which will have the
+; dchannel is the DAHDI channel which will have the
; d-channel for the trunk.
; backup1 is an optional list of backup d-channels.
;
@@ -85,7 +85,7 @@
; example, if you set 'national', you will be unable to dial local or
; international numbers.
;
-; PRI Local Dialplan: Only RARELY used for PRI (sets the calling number's
+; PRI Local Dialplan: Only RARELY used for PRI (sets the calling number's
; numbering plan). In North America, the typical use is sending the 10 digit
; callerID number and setting the prilocaldialplan to 'national' (the default).
; Only VERY rarely will you need to change this.
@@ -98,12 +98,12 @@
; national: National ISDN
; international: International ISDN
; dynamic: Dynamically selects the appropriate dialplan
-; redundant: Same as dynamic, except that the underlying number is not
+; redundant: Same as dynamic, except that the underlying number is not
; changed (not common)
;
;pridialplan=unknown
;prilocaldialplan=national
-;
+;
; pridialplan may be also set at dialtime, by prefixing the dialled number with
; one of the following letters:
; U - Unknown
@@ -133,27 +133,27 @@
;
; PRI caller ID prefixes based on the given TON/NPI (dialplan)
; This is especially needed for EuroISDN E1-PRIs
-;
+;
; None of the prefix settings can be changed on reload.
;
-; sample 1 for Germany
+; sample 1 for Germany
;internationalprefix = 00
;nationalprefix = 0
;localprefix = 0711
;privateprefix = 07115678
-;unknownprefix =
-;
-; sample 2 for Germany
+;unknownprefix =
+;
+; sample 2 for Germany
;internationalprefix = +
;nationalprefix = +49
;localprefix = +49711
;privateprefix = +497115678
-;unknownprefix =
+;unknownprefix =
;
; PRI resetinterval: sets the time in seconds between restart of unused
; B channels; defaults to 'never'.
;
-;resetinterval = 3600
+;resetinterval = 3600
;
; Overlap dialing mode (sending overlap digits)
; Cannot be changed on a reload.
@@ -168,7 +168,7 @@
; Enable this to report Busy and Congestion on a PRI using out-of-band
; notification. Inband indication, as used by Asterisk doesn't seem to work
; with all telcos.
-;
+;
; outofband: Signal Busy/Congestion out of band with RELEASE/DISCONNECT
; inband: Signal Busy/Congestion using in-band tones (default)
;
@@ -206,7 +206,7 @@
; T203: Layer 2 max time without frames being exchanged (default 10000 ms)
; T305: Wait for DISCONNECT acknowledge (default 30000 ms)
; T308: Wait for RELEASE acknowledge (default 4000 ms)
-; T309: Maintain active calls on Layer 2 disconnection (default -1,
+; T309: Maintain active calls on Layer 2 disconnection (default -1,
; Asterisk clears calls)
; EuroISDN: 6000 to 12000 ms, according to (N200 + 1) x T200 + 2s
; May vary in other ISDN standards (Q.931 1993 : 90000 ms)
@@ -284,11 +284,11 @@
; (see below). The 'signalling' format specified will be the inbound signalling
; format. If you only specify 'signalling', then it will be the format for
; both inbound and outbound.
-;
-; outsignalling can only be one of:
+;
+; outsignalling can only be one of:
; em, em_e1, em_w, sf, sf_w, sf_featd, sf_featdmf, sf_featb, featd,
; featdmf, featdmf_ta, e911, fgccama, fgccamamf
-;
+;
; outsignalling cannot be changed on a reload.
;
;signalling=featdmf
@@ -318,9 +318,9 @@
; None of them will update on a reload.
;
; How long generated tones (DTMF and MF) will be played on the channel
-; (in milliseconds).
-;
-; This is a global, rather than a per-channel setting. It will not be
+; (in milliseconds).
+;
+; This is a global, rather than a per-channel setting. It will not be
; updated on a reload.
;
;toneduration=100
@@ -354,7 +354,7 @@
; What signals the start of caller ID
; ring = a ring signals the start (default)
; polarity = polarity reversal signals the start
-; polarity_IN = polarity reversal signals the start, for India,
+; polarity_IN = polarity reversal signals the start, for India,
; for dtmf dialtone detection; using DTMF.
; (see doc/India-CID.txt)
;
@@ -381,7 +381,7 @@
; fsk,rpas - the FXO line is monitored for MWI FSK spills preceded
; by a ring pulse alert signal.
; neon - The fxo line is monitored for the presence of NEON pulses
-; indicating MWI.
+; indicating MWI.
; When detected, an internal Asterisk MWI event is generated so that any other
; part of Asterisk that cares about MWI state changes is notified, just as if
; the state change came from app_voicemail.
@@ -432,7 +432,7 @@
;
; Some countries (UK) have ring tones with different ring tones (ring-ring),
; which means the caller ID needs to be set later on, and not just after
-; the first ring, as per the default (1).
+; the first ring, as per the default (1).
;
;sendcalleridafter = 2
;
@@ -472,10 +472,10 @@
;
callreturn=yes
;
-; Stutter dialtone support: If a mailbox is specified without a voicemail
-; context, then when voicemail is received in a mailbox in the default
+; Stutter dialtone support: If a mailbox is specified without a voicemail
+; context, then when voicemail is received in a mailbox in the default
; voicemail context in voicemail.conf, taking the phone off hook will cause a
-; stutter dialtone instead of a normal one.
+; stutter dialtone instead of a normal one.
;
; If a mailbox is specified *with* a voicemail context, the same will result
; if voicemail received in mailbox in the specified voicemail context.
@@ -486,9 +486,9 @@
;
; for any other voicemail context, the following will produce the stutter tone:
;
-;mailbox=1234 at context
-;
-; Enable echo cancellation
+;mailbox=1234 at context
+;
+; Enable echo cancellation
; Use either "yes", "no", or a power of two from 32 to 256 if you wish to
; actually set the number of taps of cancellation.
;
@@ -552,7 +552,7 @@
;
; There are several independent gain settings:
; rxgain: gain for the rx (receive - into Asterisk) channel. Default: 0.0
-; txgain: gain for the tx (transmit - out of Asterisk Asterisk) channel.
+; txgain: gain for the tx (transmit - out of Asterisk Asterisk) channel.
; Default: 0.0
; cid_rxgain: set the gain just for the caller ID sounds Asterisk
; emits. Default: 5.0 .
@@ -600,10 +600,10 @@
;
; caller ID can be set to "asreceived" or a specific number if you want to
; override it. Note that "asreceived" only applies to trunk interfaces.
-; fullname sets just the
+; fullname sets just the
;
; fullname: sets just the name part.
-; cid_number: sets just the number part:
+; cid_number: sets just the number part:
;
;callerid = 123456
;
@@ -642,7 +642,7 @@
;smdiport=/dev/ttyS0
;
; On trunk interfaces (FXS) and E&M interfaces (E&M, Wink, Feature Group D
-; etc, it can be useful to perform busy detection either in an effort to
+; etc, it can be useful to perform busy detection either in an effort to
; detect hangup or for detecting busies. This enables listening for
; the beep-beep busy pattern.
;
@@ -685,8 +685,8 @@
;
;hanguponpolarityswitch=yes
;
-; polarityonanswerdelay: minimal time period (ms) between the answer
-; polarity switch and hangup polarity switch.
+; polarityonanswerdelay: minimal time period (ms) between the answer
+; polarity switch and hangup polarity switch.
; (default: 600ms)
;
; On trunk interfaces (FXS) it can be useful to attempt to follow the progress
@@ -699,7 +699,7 @@
; with "progzone".
;
; progzone also affects the pattern used for buzydetect (unless
-; busypattern is set explicitly). The possible values are:
+; busypattern is set explicitly). The possible values are:
; us (default)
; ca (alias for 'us')
; cr (Costa Rica)
@@ -741,7 +741,7 @@
;faxdetect=no
;
; When 'faxdetect' is used, one could use 'faxbuffers' to configure the DAHDI
-; transmit buffer policy. The default is *OFF*. When this configuration
+; transmit buffer policy. The default is *OFF*. When this configuration
; option is used, the faxbuffer policy will be used for the life of the call
; after a fax tone is detected. The faxbuffer policy is reverted after the
; call is torn down. The sample below will result in 6 buffers and a full
@@ -834,7 +834,7 @@
; parameters that were specified above its declaration.
;
; For GR-303, CRV's are created like channels except they must start with the
-; trunk group followed by a colon, e.g.:
+; trunk group followed by a colon, e.g.:
;
; crv => 1:1
; crv => 2:1-2,5-8
@@ -908,15 +908,15 @@
; A range of -1 will force it to always match.
; Anything lower than -1 would presumably cause it to never match.
;
-;dring1=95,0,0
-;dring1context=internal1
+;dring1=95,0,0
+;dring1context=internal1
;dring1range=10
-;dring2=325,95,0
-;dring2context=internal2
+;dring2=325,95,0
+;dring2context=internal2
;dring2range=10
; If no pattern is matched here is where we go.
;context=default
-;channel => 1
+;channel => 1
; ---------------- Options for use with signalling=ss7 -----------------
; None of them can be changed by a reload.
@@ -945,12 +945,12 @@
;
;ss7_calling_nai=dynamic
;
-;
-; sample 1 for Germany
+;
+; sample 1 for Germany
;ss7_internationalprefix = 00
;ss7_nationalprefix = 0
-;ss7_subscriberprefix =
-;ss7_unknownprefix =
+;ss7_subscriberprefix =
+;ss7_unknownprefix =
;
; This option is used to disable automatic sending of ACM when the call is started
@@ -1056,7 +1056,7 @@
; 'stack' is for very verbose output of the channel and context call stack, only useful
; if you are debugging a crash or want to learn how the library works. The stack logging
; will be only enabled if the openr2 library was compiled with -DOR2_TRACE_STACKS
-; You can mix up values, like: loglevel=error,debug,mf to log just error, debug and
+; You can mix up values, like: loglevel=error,debug,mf to log just error, debug and
; multi frequency messages
; 'all' is a special value to log all the activity
; 'nothing' is a clean-up value, in case you want to not log any activity for
@@ -1110,20 +1110,20 @@
; You most likely dont need this feature. Default is yes.
; When this is set to yes, all calls that are offered (incoming calls) which
-; DNIS is valid (exists in extensions.conf) and pass collect call validation
+; DNIS is valid (exists in extensions.conf) and pass collect call validation
; will be accepted with a Group B tone (either call with charge or not, depending on mfcr2_charge_calls)
; with this set to 'no' then the call will NOT be accepted on offered, and the call will start its
; execution in extensions.conf without being accepted until the channel is answered (either with Answer() or
-; any other application resulting in the channel being answered).
+; any other application resulting in the channel being answered).
; This can be set to 'no' if your telco or PBX needs the hangup cause to be set accurately
; when this option is set to no you must explicitly accept the call with DAHDIAcceptR2Call
-; or implicitly through the Answer() application.
+; or implicitly through the Answer() application.
; mfcr2_accept_on_offer=yes
; WARNING: advanced users only! I really mean it
; this parameter is commented by default because
; YOU DON'T NEED IT UNLESS YOU REALLY GROK MFC/R2
-; READ COMMENTS on doc/r2proto.conf in openr2 package
+; READ COMMENTS on doc/r2proto.conf in openr2 package
; for more info
; mfcr2_advanced_protocol_file=/path/to/r2proto.conf
@@ -1171,7 +1171,7 @@
; chan_dahdi.conf and [general] in users.conf - one section's configuration
; does not affect another one's.
;
-; Instead of letting common configuration values "slide through" you can
+; Instead of letting common configuration values "slide through" you can
; use configuration templates to easily keep the common part in one
; place and override where needed.
;
Modified: team/group/bindings/configs/cli_aliases.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/cli_aliases.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/cli_aliases.conf.sample (original)
+++ team/group/bindings/configs/cli_aliases.conf.sample Thu May 28 10:34:45 2009
@@ -13,7 +13,7 @@
;template = asterisk12 ; Asterisk 1.2 style syntax
;template = asterisk14 ; Asterisk 1.4 style syntax
;template = individual_custom ; see [individual_custom] example below which
- ; includes a list of aliases from an external
+ ; includes a list of aliases from an external
; file
@@ -70,7 +70,7 @@
; by Asterisk. If you wish to use the provided templates, simply define the
; context name which does not utilize the '_tpl' at the end. For example,
; if you would like to use the Asterisk 1.2 style syntax, define in the
-; [general] section
+; [general] section
[asterisk12_tpl](!)
show channeltypes=core show channeltypes
@@ -92,7 +92,7 @@
show applications=core show applications
show functions=core show functions
show switches=core show switches
-show hints=core show hints
+show hints=core show hints
show globals=core show globals
show function=core show function
show application=core show application
@@ -102,7 +102,7 @@
show audio codecs=core show audio codecs
show video codecs=core show video codecs
show image codecs=core show image codecs
-show codec=core show codec
+show codec=core show codec
moh classes show=moh show classes
moh files show=moh show files
agi no debug=agi debug off
Modified: team/group/bindings/configs/console.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/console.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/console.conf.sample (original)
+++ team/group/bindings/configs/console.conf.sample Thu May 28 10:34:45 2009
@@ -5,7 +5,7 @@
[general]
; Set this option to "yes" to enable automatically answering calls on the
-; console. This is very useful if the console is used as an intercom.
+; console. This is very useful if the console is used as an intercom.
; The default value is "no".
;
;autoanswer = no
@@ -21,7 +21,7 @@
;extension = s
; Set the default CallerID for created channels.
-;
+;
;callerid = MyName Here <(256) 428-6000>
; Set the default language for created channels.
Modified: team/group/bindings/configs/dundi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/dundi.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/dundi.conf.sample (original)
+++ team/group/bindings/configs/dundi.conf.sample Thu May 28 10:34:45 2009
@@ -1,6 +1,6 @@
;
; DUNDi configuration file
-;
+;
; For more information about DUNDi, see http://www.dundi.com
;
;
@@ -50,9 +50,9 @@
ttl=32
;
; If we don't get ACK to our DPDISCOVER within 2000ms, and autokill is set
-; to yes, then we cancel the whole thing (that's enough time for one
+; to yes, then we cancel the whole thing (that's enough time for one
; retransmission only). This is used to keep things from stalling for a long
-; time for a host that is not available, but would be ill advised for bad
+; time for a host that is not available, but would be ill advised for bad
; connections. In addition to 'yes' or 'no' you can also specify a number
; of milliseconds. See 'qualify' for individual peers to turn on for just
; a specific peer.
@@ -60,7 +60,7 @@
autokill=yes
;
; pbx_dundi creates a rotating key called "secret", under the family
-; 'secretpath'. The default family is dundi (resulting in
+; 'secretpath'. The default family is dundi (resulting in
; the key being held at dundi/secret).
;
;secretpath=dundi
@@ -78,8 +78,8 @@
;
; The "mappings" section maps DUNDi contexts
; to contexts on the local asterisk system. Remember
-; that numbers that are made available under the e164
-; DUNDi context are regulated by the DUNDi General Peering
+; that numbers that are made available under the e164
+; DUNDi context are regulated by the DUNDi General Peering
; Agreement (GPA) if you are a member of the DUNDi E.164
; Peering System.
;
@@ -108,14 +108,14 @@
;
; Further options may include:
;
-; nounsolicited: No unsolicited calls of any type permitted via this
+; nounsolicited: No unsolicited calls of any type permitted via this
; route
-; nocomunsolicit: No commercial unsolicited calls permitted via
+; nocomunsolicit: No commercial unsolicited calls permitted via
; this route
; residential: This number is known to be a residence
; commercial: This number is known to be a business
; mobile: This number is known to be a mobile phone
-; nocomunsolicit: No commercial unsolicited calls permitted via
+; nocomunsolicit: No commercial unsolicited calls permitted via
; this route
; nopartial: Do not search for partial matches
;
@@ -163,7 +163,7 @@
;
; host - What their host is
;
-; order - What search order to use. May be 'primary', 'secondary',
+; order - What search order to use. May be 'primary', 'secondary',
; 'tertiary' or 'quartiary'. In large systems, it is beneficial
; to only query one up-stream host in order to maximize caching
; value. Adding one with primary and one with secondary gives you
@@ -187,7 +187,7 @@
; the local system. Set "all" to deny this host to
; lookup all contexts.
;
-; model - inbound, outbound, or symmetric for whether we receive
+; model - inbound, outbound, or symmetric for whether we receive
; requests only, transmit requests only, or do both.
;
; precache - Utilize/Permit precaching with this peer (to pre
@@ -241,7 +241,7 @@
;inkey = littleguy
;outkey = ourkey
;include = e164 ; In this case used only for precaching
-;permit = e164
+;permit = e164
;qualify = yes
;
@@ -254,7 +254,7 @@
;register = yes
;inkey = dhcp34
;permit = all ; In this case used only for precaching
-;include = all
+;include = all
;qualify = yes
;outkey=foo
Modified: team/group/bindings/configs/extconfig.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/extconfig.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/extconfig.conf.sample (original)
+++ team/group/bindings/configs/extconfig.conf.sample Thu May 28 10:34:45 2009
@@ -7,7 +7,7 @@
;
[settings]
;
-; Static configuration files:
+; Static configuration files:
;
; file.conf => driver,database[,table]
;
Modified: team/group/bindings/configs/extensions.ael.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/extensions.ael.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/extensions.ael.sample (original)
+++ team/group/bindings/configs/extensions.ael.sample Thu May 28 10:34:45 2009
@@ -3,16 +3,16 @@
//
//
// Static extension configuration file, used by
-// the pbx_ael module. This is where you configure all your
-// inbound and outbound calls in Asterisk.
-//
-// This configuration file is reloaded
+// the pbx_ael module. This is where you configure all your
+// inbound and outbound calls in Asterisk.
+//
+// This configuration file is reloaded
// - With the "ael reload" command in the CLI
// - With the "reload" command (that reloads everything) in the CLI
// The "Globals" category contains global variables that can be referenced
// in the dialplan by using the GLOBAL dialplan function:
-// ${GLOBAL(VARIABLE)}
+// ${GLOBAL(VARIABLE)}
// ${${GLOBAL(VARIABLE)}} or ${text${GLOBAL(VARIABLE)}} or any hybrid
// Unix/Linux environmental variables are reached with the ENV dialplan
// function: ${ENV(VARIABLE)}
@@ -44,8 +44,8 @@
};
//
-// Any category other than "General" and "Globals" represent
-// extension contexts, which are collections of extensions.
+// Any category other than "General" and "Globals" represent
+// extension contexts, which are collections of extensions.
//
// Extension names may be numbers, letters, or combinations
// thereof. If an extension name is prefixed by a '_'
@@ -56,12 +56,12 @@
// Z - any digit from 1-9
// N - any digit from 2-9
// [1235-9] - any digit in the brackets (in this example, 1,2,3,5,6,7,8,9)
-// . - wildcard, matches anything remaining (e.g. _9011. matches
+// . - wildcard, matches anything remaining (e.g. _9011. matches
// anything starting with 9011 excluding 9011 itself)
// ! - wildcard, causes the matching process to complete as soon as
// it can unambiguously determine that no other matches are possible
//
-// For example the extension _NXXXXXX would match normal 7 digit dialings,
+// For example the extension _NXXXXXX would match normal 7 digit dialings,
// while _1NXXNXXXXXX would represent an area code plus phone number
// preceded by a one.
//
@@ -72,8 +72,8 @@
// The priority "same" or "s" means the same as the previously specified
// priority, again regardless of whether the previous entry was for the
// same extension. Priorities may be immediately followed by a plus sign
-// and another integer to add that amount (most useful with 's' or 'n').
-// Priorities may then also have an alias, or label, in
+// and another integer to add that amount (most useful with 's' or 'n').
+// Priorities may then also have an alias, or label, in
// parenthesis after their name which can be used in goto situations
//
// Contexts contain several lines, one for each step of each
@@ -87,11 +87,11 @@
// exten-name => {
// application(arg1,arg2,...);
//
-// Timing list for includes is
+// Timing list for includes is
//
// <time range>|<days of week>|<days of month>|<months>
//
-// includes {
+// includes {
// daytime|9:00-17:00|mon-fri|*|*;
// };
//
@@ -129,7 +129,7 @@
//
// If you are freely delivering calls to the PSTN, list them here
//
- //_1256428XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Expose all of 256-428
+ //_1256428XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Expose all of 256-428
//_1256325XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Ditto for 256-325
};
@@ -149,8 +149,8 @@
//
// Just a wrapper for the switch
//
-
- switches {
+
+ switches {
DUNDi/e164;
};
};
@@ -168,8 +168,8 @@
};
//
-// DUNDi can also be implemented as a Macro instead of using
-// the Local channel driver.
+// DUNDi can also be implemented as a Macro instead of using
+// the Local channel driver.
//
macro ael-dundi-e164(exten) {
//
@@ -240,7 +240,7 @@
//
// Long distance context accessed through trunk interface
//
-
+
_91800NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
_91888NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
_91877NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
@@ -285,10 +285,10 @@
//
// You can use an alternative switch type as well, to resolve
-// extensions that are not known here, for example with remote
+// extensions that are not known here, for example with remote
// IAX switching you transparently get access to the remote
// Asterisk PBX
-//
+//
// switch => IAX2/user:password at bigserver/local
//
// An "lswitch" is like a switch but is literal, in that
@@ -380,7 +380,7 @@
context ael-default {
-// By default we include the demo. In a production system, you
+// By default we include the demo. In a production system, you
// probably don't want to have the demo there.
includes {
@@ -443,6 +443,6 @@
// friendly Asterisk CLI prompt.
//
// 'show application <command>' will show details of how you
-// use that particular application in this file, the dial plan.
+// use that particular application in this file, the dial plan.
//
}
Modified: team/group/bindings/configs/extensions.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/configs/extensions.conf.sample?view=diff&rev=197614&r1=197613&r2=197614
==============================================================================
--- team/group/bindings/configs/extensions.conf.sample (original)
[... 2506 lines stripped ...]
More information about the asterisk-commits
mailing list