[asterisk-commits] lmadsen: branch 1.6.1 r250039 - in /branches/1.6.1: ./ doc/tex/configuration.tex

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Mar  2 14:38:22 2010
New Revision: 250039

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250039
Log:
Merged revisions 250037 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250037 | lmadsen | 2010-03-02 15:36:10 -0500 (Tue, 02 Mar 2010) | 4 lines
  
  Update documentation to not imply we support overriding options.
  
  (closes issue #16855)
  Reported by: davidw
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/doc/tex/configuration.tex

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/doc/tex/configuration.tex
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/doc/tex/configuration.tex?view=diff&rev=250039&r1=250038&r2=250039
==============================================================================
--- branches/1.6.1/doc/tex/configuration.tex (original)
+++ branches/1.6.1/doc/tex/configuration.tex Tue Mar  2 14:38:22 2010
@@ -152,17 +152,19 @@
 \begin{astlisting}
 \begin{verbatim}
 [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
 \end{verbatim}
 \end{astlisting}
@@ -173,16 +175,22 @@
 \begin{astlisting}
 \begin{verbatim}
 [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
 \end{verbatim}
 \end{astlisting}
+
+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.
 
 \subsubsection{Additional Examples}