Merged revisions 24567 via svnmerge from

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

........
r24567 | bweschke | 2006-05-03 15:58:10 -0500 (Wed, 03 May 2006) | 3 lines

 Correct application documentation to make users aware that certain options cannot be used in conjunction with others. #6666 (chotaire) 


........


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