Merged revisions 86405 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11029)
........
r86405 | qwell | 2007-10-18 16:58:44 -0500 (Thu, 18 Oct 2007) | 4 lines

Add documentation for options in asterisk.conf

Issue 11029, patch by eserra

........


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