Recorded merge of revisions 250041 via svnmerge from

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

........
  r250041 | lmadsen | 2010-03-02 15:45:37 -0500 (Tue, 02 Mar 2010) | 4 lines
  
  Update documentation to not imply we support overriding options.
  
  (issue #16855)
  Reported by: davidw
........


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