Merged revisions 211584 via svnmerge from

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

................
  r211584 | tilghman | 2009-08-10 14:49:41 -0500 (Mon, 10 Aug 2009) | 9 lines
  
  Merged revisions 211583 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r211583 | tilghman | 2009-08-10 14:48:48 -0500 (Mon, 10 Aug 2009) | 1 line
    
    Conversion specifiers, not format specifiers
  ........
................


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

doc/CODING-GUIDELINES

@@ -388,9 +388,10 @@ When converting from strings to integers or floats, use the sscanf function
 in preference to the atoi and atof family of functions, as sscanf detects
 errors.  Always check the return value of sscanf to verify that your numeric
 variables successfully scanned before using them.  Also, to avoid a potential
-libc bug, always specify a maximum width for each format specifier, including
-integers and floats.  A good length for both integers and floats is 30, as
-this is more than generous, even if you're using doubles or long integers.
+libc bug, always specify a maximum width for each conversion specifier,
+including integers and floats.  A good length for both integers and floats is
+30, as this is more than generous, even if you're using doubles or long
+integers.
 
 * Use of functions
 ------------------