Merged revisions 302005 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302005 | twilson | 2011-01-17 09:04:59 -0600 (Mon, 17 Jan 2011) | 2 lines

  Document "encryption" option in sip.conf.sample
........

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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 03008b1..c416bd2 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -863,6 +863,9 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
                                 ; also contains the Asterisk version.
 ;sdpowner=root                  ; Allows you to change the username field in the SDP owner string, (o=)
                                 ; This field MUST NOT contain spaces
+;encryption=no                  ; Whether to offer SRTP encrypted media (and only SRTP encrypted media)
+                                ; on outgoing calls to a peer. Calls will fail with HANGUPCAUSE=58 if
+                                ; the peer does not support SRTP. Defaults to no.
 
 ;----------------------------------------- REALTIME SUPPORT ------------------------
 ; For additional information on ARA, the Asterisk Realtime Architecture,
@@ -1091,6 +1094,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ; unsolicited_mailbox
 ; use_q850_reason
 ; maxforwards
+; encryption
 
 ;[sip_proxy]
 ; For incoming calls only. Example: FWD (Free World Dialup)