Merged revisions 235181 via svnmerge from

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

........
  r235181 | jsmith | 2009-12-15 15:07:55 -0600 (Tue, 15 Dec 2009) | 4 lines
  
  Add a line showing that we can use CIDR notation.
  
  patch by jsmith, after discussion with jtodd
........


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

configs/sip.conf.sample

@@ -1196,6 +1196,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ;defaultip=192.168.0.60          ; IP address to use if peer has not registered
 ;deny=0.0.0.0/0.0.0.0            ; ACL: Control access to this account based on IP address
 ;permit=192.168.0.60/255.255.255.0
+;permit=192.168.0.60/24          ; we can also use CIDR notation for subnet masks
 
 ;[cisco1]
 ;type=friend