Merged revisions 206873 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r206873 | dvossel | 2009-07-16 16:33:51 -0500 (Thu, 16 Jul 2009) | 12 lines
  
  Merged revisions 206872 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r206872 | dvossel | 2009-07-16 16:33:19 -0500 (Thu, 16 Jul 2009) | 6 lines
    
    error in iax.conf related IP-based access control
    
    (closes issue #15518)
    Reported by: pkempgen
  ........
................


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

configs/iax.conf.sample

@@ -342,7 +342,7 @@ inkeys=freeworlddialup
 ;
 ; Further user sections may be added, specifying a context and a secret used
 ; for connections with that given authentication name.  Limited IP based
-; access control is allowed by use of "allow" and "deny" keywords.  Multiple
+; access control is allowed by use of "permit" and "deny" keywords.  Multiple
 ; rules are permitted.  Multiple permitted contexts may be specified, in
 ; which case the first will be the default.  You can also override caller*ID
 ; so that when you receive a call you set the Caller*ID to be what you want