Tilghman Lesher b292004c84 Merged revisions 218361 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r218361 | tilghman | 2009-09-14 14:29:48 -0500 (Mon, 14 Sep 2009) | 11 lines
  
  Recorded merge of revisions 218331 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218331 | tilghman | 2009-09-14 14:16:35 -0500 (Mon, 14 Sep 2009) | 4 lines
    
    Don't say "Please try again" if we don't give the user another chance to try again.
    (issue #15055, SWP-129)
     Reported by: jthurman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@218364 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-09-14 19:49:31 +00:00

..

adsi.conf.sample

…

adtranvofr.conf.sample

…

agents.conf.sample

Merged revisions 149683 via svnmerge from

2008-10-15 20:14:20 +00:00

ais.conf.sample

Mark res_ais as experimental, as the binary event format is subject to change.

2009-02-27 21:47:18 +00:00

alarmreceiver.conf.sample

…

alsa.conf.sample

…

amd.conf.sample

…

asterisk.adsi

…

cdr_adaptive_odbc.conf.sample

Comment out config line that is in a commented out context

2008-11-19 05:37:10 +00:00

cdr_custom.conf.sample

Merged revisions 60323 via svnmerge from

2007-04-05 22:40:42 +00:00

cdr_manager.conf.sample

This enhancement provided via bug 9993, a patch to upgrade cdr_manager to have cdr_custom capabilities. Many thanks to eserra for this contribution

2007-06-19 20:38:21 +00:00

cdr_odbc.conf.sample

…

cdr_pgsql.conf.sample

…

cdr_sqlite3_custom.conf.sample

Fix a few potential deadlocks in cdr_sqlite3_custom.

2007-11-09 16:32:01 +00:00

cdr_tds.conf.sample

Since it's introduction in revision 3497, cdr_tds has *never* read

2008-08-16 16:40:43 +00:00

cdr.conf.sample

(closes issue #13366)

2008-08-26 15:57:49 +00:00

chan_dahdi.conf.sample

Merged revisions 207095 via svnmerge from

2009-07-17 19:18:54 +00:00

cli_aliases.conf.sample

Merged revisions 208813 via svnmerge from

2009-07-25 12:08:58 +00:00

cli_permissions.conf.sample

Introduce CLI permissions.

2008-12-01 18:52:14 +00:00

cli.conf.sample

Clarify configuration file that can be misunderstood

2008-01-30 20:08:58 +00:00

codecs.conf.sample

…

console.conf.sample

correct the name of a CLI command for getting available device names

2008-01-20 06:13:22 +00:00

dbsep.conf.sample

Add contributed script for separation of database access from Asterisk

2008-03-11 20:58:42 +00:00

dnsmgr.conf.sample

…

dsp.conf.sample

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

dundi.conf.sample

Update dundi.conf to indicate that the asterisk.conf entityid option can be used

2008-06-10 12:50:07 +00:00

enum.conf.sample

Merged revisions 81379 via svnmerge from

2007-08-30 15:34:18 +00:00

extconfig.conf.sample

Merged revisions 212857 via svnmerge from

2009-08-18 19:28:04 +00:00

extensions_minivm.conf.sample

Mini-voicemail - an embryo for a new voicemail system based on building

2007-04-18 07:57:18 +00:00

extensions.ael.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

extensions.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:47 +00:00

extensions.lua.sample

I added a little verbage to hashtab for the hashtab_destroy func.

2008-09-25 21:18:12 +00:00

features.conf.sample

Merged revisions 186175 via svnmerge from

2009-04-02 22:00:11 +00:00

festival.conf.sample

…

followme.conf.sample

Standardize the option names for consistency (but continue to work with the

2008-08-26 18:05:58 +00:00

func_odbc.conf.sample

Better document mode=multirow, based upon a conversation with Jared.

2009-01-29 16:48:25 +00:00

gtalk.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

h323.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

http.conf.sample

Update sample configuration to match what are now the defaults for the prefix.

2008-06-26 01:11:43 +00:00

iax.conf.sample

Merged revisions 215955 via svnmerge from

2009-09-03 18:42:41 +00:00

iaxprov.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

indications.conf.sample

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

jabber.conf.sample

Disable autoprune by default.

2008-09-09 22:08:56 +00:00

jingle.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

logger.conf.sample

Merged revisions 194765 via svnmerge from

2009-05-15 18:44:22 +00:00

manager.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

meetme.conf.sample

Revert my change to the sample meetme conf file as it was incorrect.

2008-06-22 17:36:20 +00:00

mgcp.conf.sample

Merged revisions 210190 via svnmerge from

2009-08-03 20:58:48 +00:00

minivm.conf.sample

Mini-voicemail - an embryo for a new voicemail system based on building

2007-04-18 07:57:18 +00:00

misdn.conf.sample

Merged revisions 185123 via svnmerge from

2009-03-30 20:52:51 +00:00

modules.conf.sample

Merged revisions 198186 via svnmerge from

2009-05-29 23:05:52 +00:00

musiconhold.conf.sample

support relative paths in musiconhold.conf, which makes moh work by default when Asterisk was configured using --prefix and 'make samples' is run

2008-10-16 08:30:32 +00:00

muted.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

osp.conf.sample

Fix a couple of typos in the sample osp.conf.

2007-01-16 01:20:06 +00:00

oss.conf.sample

fix example configuration for video support in chan_oss

2008-05-19 14:54:34 +00:00

phone.conf.sample

Add support for G729 passthrough with Sigma Designs boards. (issue #8829 reported by ywalther)

2007-01-16 17:23:31 +00:00

phoneprov.conf.sample

Add internationalization to sample configuration file

2008-12-12 15:10:25 +00:00

queuerules.conf.sample

Merging the queue-penalty branch. In short, this allows one to dynamically adjust

2007-12-21 00:44:17 +00:00

queues.conf.sample

Merged revisions 213494 via svnmerge from

2009-08-21 16:06:33 +00:00

res_config_sqlite.conf.sample

Merged revisions 204440 via svnmerge from

2009-06-30 17:22:27 +00:00

res_ldap.conf.sample

Merged revisions 210190 via svnmerge from

2009-08-03 20:58:48 +00:00

res_odbc.conf.sample

ODBC transaction support

2009-02-19 00:26:01 +00:00

res_pgsql.conf.sample

Merge the adaptive realtime branch, which will make adding new required fields

2008-06-05 19:07:27 +00:00

res_snmp.conf.sample

Clarifications on the different models and reference to further docs.

2009-02-26 15:02:53 +00:00

rpt.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

rtp.conf.sample

Update documentation to include default setting. This is for you jtodd!

2008-09-26 23:12:13 +00:00

say.conf.sample

Add support for default "say mode" (whether to use the "old" method or "new" method. "new" method being config file)

2007-07-20 22:25:41 +00:00

sip_notify.conf.sample

Add ability to remotely reboot snom phones. Also cleaned up and

2008-10-04 01:54:44 +00:00

sip.conf.sample

Merged revisions 216438 via svnmerge from

2009-09-07 10:52:05 +00:00

skinny.conf.sample

Merged revisions 210190 via svnmerge from

2009-08-03 20:58:48 +00:00

sla.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:47 +00:00

smdi.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:47 +00:00

telcordia-1.adsi

…

udptl.conf.sample

Merged revisions 209132 via svnmerge from

2009-07-27 17:57:40 +00:00

unistim.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

usbradio.conf.sample

Add usbradio.conf.sample from branches/1.4/configs - r84162.

2007-11-09 18:57:21 +00:00

users.conf.sample

Allow alternative extensions to be specified for a user.

2008-06-19 19:22:59 +00:00

voicemail.conf.sample

Merged revisions 218361 via svnmerge from

2009-09-14 19:49:31 +00:00

vpb.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:47 +00:00