From 11000ecd764c1bd5080e7422e2e832082f0611c4 Mon Sep 17 00:00:00 2001
From: lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 2 Mar 2010 20:36:10 +0000
Subject: Update documentation to not imply we support overriding options.

(closes issue #16855)
Reported by: davidw

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@250037 f38db490-d61c-443f-a65b-d21fe96a405b
---
 doc/tex/configuration.tex | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/doc/tex/configuration.tex b/doc/tex/configuration.tex
index 712b6b308..0f766f441 100644
--- 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)
-- 
cgit v1.2.3