From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 2 Mar 2010 20:45:37 +0000 (+0000)
Subject: Update documentation to not imply we support overriding options.
X-Git-Tag: 1.4.30-rc3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91785154c550f7d7e839ec4422cb5ec69d6fa4a;p=thirdparty%2Fasterisk.git

Update documentation to not imply we support overriding options.

(issue #16855)
Reported by: davidw

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@250041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 39e9061014..7f86d060f4 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:
 --------------------