diff options
author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 20:42:42 +0000 |
---|---|---|
committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 20:42:42 +0000 |
commit | 3cda43d7dc5b0aa982c958fadb7e2eb8124244f2 (patch) | |
tree | a9801a3a5ec2758c17a772bba648fa164384bdcc /doc | |
parent | 74589da0e800b5898429f105669f3b567438030c (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@250040 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tex/configuration.tex | 32 |
1 files changed, 20 insertions, 12 deletions
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) |