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
........

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

diff --git a/doc/tex/configuration.tex b/doc/tex/configuration.tex
index 712b6b30816ad4c7e8a5c8e263a44d2fffbcdf66..0f766f4412561e137e0a5d09ca7a1a582feca749 100644 (file)
--- a/doc/tex/configuration.tex
+++ b/doc/tex/configuration.tex
@@ -152,17 +152,19 @@ consider the following:
 \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,17 +175,23 @@ following way:
 \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}
 
 (in top-level sip.conf)