Merged revisions 306999 via svnmerge from

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/branches/10@331139 65c4cc65-6c06-0410-ace0-fbb531ad65f3