diff options
| author | Jason Parker <jparker@digium.com> | 2011-08-09 15:51:38 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-08-09 15:51:38 +0000 |
| commit | 19c8278815c19785925d58d357b3e84c5a1ed979 (patch) | |
| tree | d854ca67964927b93b4c8e3f7e0cac38721a24b7 /configs/asterisk.conf.sample | |
| parent | 16acfefa74f3f2d2ec5cfc33b9b21b5d5648ba3f (diff) | |
Merged revisions 331138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
........
r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line
Revert merge of r306999, due to merge conflict.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/asterisk.conf.sample')
| -rw-r--r-- | configs/asterisk.conf.sample | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/configs/asterisk.conf.sample b/configs/asterisk.conf.sample index 618eceab5..b8d6b3ea9 100644 --- a/configs/asterisk.conf.sample +++ b/configs/asterisk.conf.sample @@ -61,10 +61,6 @@ 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. |