summaryrefslogtreecommitdiff
path: root/configs/asterisk.conf.sample
AgeCommit message (Collapse)Author
2011-08-09Merged revisions 331139 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331139 | qwell | 2011-08-09 10:50:07 -0500 (Tue, 09 Aug 2011) | 19 lines Merged revisions 306999 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r306999 | lathama | 2011-02-08 14:22:35 -0600 (Tue, 08 Feb 2011) | 12 lines Documentation Updates Note default polling setting in voicemail.conf Add missing config to asterisk.conf Update manpage (issue #16505) Reported by: tzafrir Patches: asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46) Tested by: lathama, tzafrir ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331141 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09Merged revisions 331138 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line Revert merge of r306999, due to merge conflict. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-08Documentation UpdatesAndrew Latham
Note default polling setting in voicemail.conf Add missing config to asterisk.conf Update manpage (issue #16505) Reported by: tzafrir Patches: asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46) Tested by: lathama, tzafrir git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-05Restore previous asterisk.conf syntax, where the directories aren't ↵Russell Bryant
commented out. This fixes some breakage in the test suite, that uses the contents of asterisk.conf to discover the install layout on the system. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@261364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-05New static asterisk.conf.sample file.Paul Belanger
This simply moves the functionality from the Makefile (cleaning it up) into an external asterisk.conf.samples file. Also updates formatting (easier to read) and grammar changes to asterisk.conf.samples. (closes issue #17027) Reported by: pabelanger Patches: 0017027.asterisk.conf.v6.patch uploaded by pabelanger (license 224) Tested by: qwell, lmadsen, pabelanger, chappell Review: https://reviewboard.asterisk.org/r/616/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@261124 65c4cc65-6c06-0410-ace0-fbb531ad65f3