diff options
| author | Jason Parker <jparker@digium.com> | 2011-08-09 15:53:26 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-08-09 15:53:26 +0000 |
| commit | 873962f7727709da448e4ab7fa7fc6871e386635 (patch) | |
| tree | 54e8d3145524c0b17813829fc686de0613740f93 /configs | |
| parent | 19c8278815c19785925d58d357b3e84c5a1ed979 (diff) | |
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
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/asterisk.conf.sample | 4 | ||||
| -rw-r--r-- | configs/voicemail.conf.sample | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configs/asterisk.conf.sample b/configs/asterisk.conf.sample index b8d6b3ea9..618eceab5 100644 --- a/configs/asterisk.conf.sample +++ b/configs/asterisk.conf.sample @@ -61,6 +61,10 @@ astlogdir => /var/log/asterisk ;rungroup = asterisk ; The group to run as. ;lightbackground = yes ; If your terminal is set for a light-colored ; background. +;forceblackbackground = yes ; Force the background of the terminal to be + ; black, in order for terminal colors to show + ; up properly. +;defaultlanguage = en ; Default language documentation_language = en_US ; Set the language you want documentation ; displayed in. Value is in the same format as ; locale names. diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index c79890e54..318f682b7 100644 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -181,7 +181,7 @@ pagerdateformat=%A, %B %d, %Y at %r ; ; Examples of situations that would require this option are ; ; web interfaces to voicemail or an email client in the case ; ; of using IMAP storage. -; +; ; Default: no ;pollfreq=30 ; If the "pollmailboxes" option is enabled, this option ; ; sets the polling frequency. The default is once every ; ; 30 seconds. |