Merged revisions 331139 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:53:26 +0000 (15:53 +0000)
committerJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:53:26 +0000 (15:53 +0000)
commit873962f7727709da448e4ab7fa7fc6871e386635
tree54e8d3145524c0b17813829fc686de0613740f93
parent19c8278815c19785925d58d357b3e84c5a1ed979
Merged revisions 331139 via svnmerge from
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
configs/asterisk.conf.sample
configs/voicemail.conf.sample
doc/asterisk.8
doc/asterisk.sgml