diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 20:45:37 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 20:45:37 +0000 |
| commit | 0f574f8716d02dc8016955feb44419088320a723 (patch) | |
| tree | 773945184eb05e6d6da220c26768134dca3f9ae8 /doc | |
| parent | 271c17c2e0c14d1d8d215a9358cfde00c73fb1ab (diff) | |
Update documentation to not imply we support overriding options.
(issue #16855)
Reported by: davidw
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@250041 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/configuration.txt | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/doc/configuration.txt b/doc/configuration.txt index 39e906101..7f86d060f 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -118,32 +118,40 @@ previously based upon) were included in the new section. For example consider the following: [foo] -permit=192.168.0.2 -host=asdf -deny=192.168.0.1 +disallow=all +allow=ulaw +allow=alaw [bar] -permit=192.168.1.2 -host=jkl -deny=192.168.1.1 +allow=gsm +allow=g729 +permit=192.168.2.1 [baz](foo,bar) +type=friend permit=192.168.3.1 +context=incoming host=bnm -The [baz] section will be processed as though it had been written in the +The [baz] section will be processed as though it had been written in the following way: [baz] -permit=192.168.0.2 -host=asdf -deny=192.168.0.1 -permit=192.168.1.2 -host=jkl -deny=192.168.1.1 +disallow=all +allow=ulaw +allow=alaw +allow=gsm +allow=g729 +permit=192.168.2.1 +type=friend permit=192.168.3.1 +context=incoming host=bnm +It should also be noted that there are no guaranteed overriding semantics, +meaning that if you define something in one template, you should not expect to +be able to override it by defining it again in another template. + Additional Examples: -------------------- |