diff --git a/doc/diffutils.texi b/doc/diffutils.texi index e428646..d0c3549 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -3587,20 +3587,16 @@ In the above table, operands that are byte counts are normally decimal, but may be preceded by @samp{0} for octal and @samp{0x} for hexadecimal. -A byte count can be followed by a suffix to specify a multiple of that -count; in this case an omitted integer is understood to be 1. A bare -size letter, or one followed by @samp{iB}, specifies a multiple using -powers of 1024. A size letter followed by @samp{B} specifies powers -of 1000 instead. For example, @option{-n 4M} and @option{-n 4MiB} are -equivalent to @option{-n 4194304}, whereas @option{-n 4MB} is -equivalent to @option{-n 4000000}. This notation is upward compatible -with the @uref{http://www.bipm.fr/enus/3_SI/si-prefixes.html, SI -prefixes} for decimal multiples and with the -@uref{http://physics.nist.gov/cuu/Units/binary.html, IEC 60027-2 -prefixes for binary multiples}. +A byte count can be followed by a suffix to specify a +multiple of the count. A bare letter, +or one followed by @samp{iB}, specifies +a multiple using powers of 1024. A letter followed by @samp{B} +specifies powers of 1000 instead. For example, @samp{-n 1M} and +@samp{-n 1MiB} are equivalent to @samp{-n 1048576}, whereas @samp{-n 1MB} is +equivalent to @samp{-n 1000000}. -The following suffixes are defined. Large sizes like @code{1Y} may be -rejected by your computer due to limitations of its arithmetic. +The following suffixes are defined. Large sizes like @code{1Q} +may be rejected by your computer due to limitations of its arithmetic. @table @samp @item kB @@ -3610,8 +3606,8 @@ kilobyte: @math{10^3 = 1000}. @itemx K @itemx KiB @cindex kibibyte, definition of -kibibyte: @math{2^10 = 1024}. @samp{K} is special: the SI prefix is -@samp{k} and the IEC 60027-2 prefix is @samp{Ki}, but tradition and +kibibyte: @math{2^{10} = 1024}. @samp{K} is special: the SI prefix is +@samp{k} and the ISO/IEC 80000-13 prefix is @samp{Ki}, but tradition and POSIX use @samp{k} to mean @samp{KiB}. @item MB @cindex megabyte, definition of @@ -3619,49 +3615,59 @@ megabyte: @math{10^6 = 1,000,000}. @item M @itemx MiB @cindex mebibyte, definition of -mebibyte: @math{2^20 = 1,048,576}. +mebibyte: @math{2^{20} = 1,048,576}. @item GB @cindex gigabyte, definition of gigabyte: @math{10^9 = 1,000,000,000}. @item G @itemx GiB @cindex gibibyte, definition of -gibibyte: @math{2^30 = 1,073,741,824}. +gibibyte: @math{2^{30} = 1,073,741,824}. @item TB @cindex terabyte, definition of -terabyte: @math{10^12 = 1,000,000,000,000}. +terabyte: @math{10^{12} = 1,000,000,000,000}. @item T @itemx TiB @cindex tebibyte, definition of -tebibyte: @math{2^40 = 1,099,511,627,776}. +tebibyte: @math{2^{40} = 1,099,511,627,776}. @item PB @cindex petabyte, definition of -petabyte: @math{10^15 = 1,000,000,000,000,000}. +petabyte: @math{10^{15} = 1,000,000,000,000,000}. @item P @itemx PiB @cindex pebibyte, definition of -pebibyte: @math{2^50 = 1,125,899,906,842,624}. +pebibyte: @math{2^{50} = 1,125,899,906,842,624}. @item EB @cindex exabyte, definition of -exabyte: @math{10^18 = 1,000,000,000,000,000,000}. +exabyte: @math{10^{18} = 1,000,000,000,000,000,000}. @item E @itemx EiB @cindex exbibyte, definition of -exbibyte: @math{2^60 = 1,152,921,504,606,846,976}. +exbibyte: @math{2^{60} = 1,152,921,504,606,846,976}. @item ZB @cindex zettabyte, definition of -zettabyte: @math{10^21 = 1,000,000,000,000,000,000,000} +zettabyte: @math{10^{21} = 1,000,000,000,000,000,000,000} @item Z @itemx ZiB -@math{2^70 = 1,180,591,620,717,411,303,424}. -(@samp{Zi} is a GNU extension to IEC 60027-2.) +zebibyte: @math{2^{70} = 1,180,591,620,717,411,303,424}. @item YB @cindex yottabyte, definition of -yottabyte: @math{10^24 = 1,000,000,000,000,000,000,000,000}. +yottabyte: @math{10^{24} = 1,000,000,000,000,000,000,000,000}. @item Y @itemx YiB -@math{2^80 = 1,208,925,819,614,629,174,706,176}. -(@samp{Yi} is a GNU extension to IEC 60027-2.) +yobibyte: @math{2^{80} = 1,208,925,819,614,629,174,706,176}. +@item RB +@cindex ronnabyte, definition of +ronnabyte: @math{10^{27} = 1,000,000,000,000,000,000,000,000,000}. +@item R +@itemx RiB +robibyte: @math{2^{90} = 1,237,940,039,285,380,274,899,124,224}. +@item QB +@cindex quettabyte, definition of +quettabyte: @math{10^{30} = 1,000,000,000,000,000,000,000,000,000,000}. +@item Q +@itemx QiB +quebibyte: @math{2^{100} = 1,267,650,600,228,229,401,496,703,205,376}. @end table @node Invoking diff