[svn-commits] lmadsen: branch 1.4 r250041 - /branches/1.4/doc/configuration.txt

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Tue Mar  2 14:45:37 2010
New Revision: 250041

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250041
Log:
Update documentation to not imply we support overriding options.

(issue #16855)
Reported by: davidw

Modified:
    branches/1.4/doc/configuration.txt

Modified: branches/1.4/doc/configuration.txt
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/doc/configuration.txt?view=diff&rev=250041&r1=250040&r2=250041
==============================================================================
--- branches/1.4/doc/configuration.txt (original)
+++ branches/1.4/doc/configuration.txt Tue Mar  2 14:45:37 2010
@@ -118,31 +118,39 @@
 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:
 --------------------