kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update documentation to not imply we support overriding options.

Browse Source 
(closes issue #16855)
Reported by: davidw

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@250037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Leif Madsen
2010-03-02 20:36:10 +00:00
parent ecfa2dcb2e
commit aec5c6f840
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
doc/tex/configuration.tex
View File

@@ -152,17 +152,19 @@ consider the following:
\begin{astlisting} \begin{astlisting}
\begin{verbatim} \begin{verbatim}
[foo] [foo]
permit=192.168.0.2 disallow=all
host=asdf allow=ulaw
deny=192.168.0.1 allow=alaw
[bar] [bar]
permit=192.168.1.2 allow=gsm
host=jkl allow=g729
deny=192.168.1.1 permit=192.168.2.1
[baz](foo,bar) [baz](foo,bar)
type=friend
permit=192.168.3.1 permit=192.168.3.1
context=incoming
host=bnm host=bnm
\end{verbatim} \end{verbatim}
\end{astlisting} \end{astlisting}
@@ -173,17 +175,23 @@ following way:
\begin{astlisting} \begin{astlisting}
\begin{verbatim} \begin{verbatim}
[baz] [baz]
permit=192.168.0.2 disallow=all
host=asdf allow=ulaw
deny=192.168.0.1 allow=alaw
permit=192.168.1.2 allow=gsm
host=jkl allow=g729
deny=192.168.1.1 permit=192.168.2.1
type=friend
permit=192.168.3.1 permit=192.168.3.1
context=incoming
host=bnm host=bnm
\end{verbatim} \end{verbatim}
\end{astlisting} \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} \subsubsection{Additional Examples}
(in top-level sip.conf) (in top-level sip.conf)