diff --git a/doc/html/burst_buffer.shtml b/doc/html/burst_buffer.shtml
index 5db6881f77ec02255e7ce13e3cbbc3470f27822f..eff55ad435d9af46151ccb4979fe50bdd7c55077 100644
--- a/doc/html/burst_buffer.shtml
+++ b/doc/html/burst_buffer.shtml
@@ -176,8 +176,12 @@ buffers, which have a lifetime independent of the job.</p>
 </ul>
 <p>The persistent burst buffer name may not start with a numeric value (numeric
 names are reserved for job-specific burst buffers).
-The <b>capacity</b> (size) specification can include a suffix of M, G, T, P, etc.
-for megabytes, gigabytes, terabytes, petabytes, etc.
+The <b>capacity</b> (size) specification can include a suffix of "N" (nodes),
+"K|KiB", "M|MiB", "G|GiB", "T|TiB", "P|PiB" (for powers of 1024) and "KB",
+"MB", "GB", "TB", "PB" (for powers of 1000). NOTE: Usually Slurm interprets
+KB, MB, GB, TB, PB, TB units as powers of 1024, but for Burst Buffers size
+specifications Slurm supports both IEC/SI formats. This is because the CRAY API
+for supports both formats.
 The <b>access</b> parameter identifies the buffer access mode. Supported access
 modes for the burst_buffer/cray plugin include: striped, private, and ldbalance.
 The <b>pool</b> parameter identifies the resource pool from in the burst buffer
@@ -228,8 +232,12 @@ Multiple directives should be space separated.</p>
 </ul>
 <p>If a swap option is specified, the job must also specify the required
 node count.
-The capacity specification can include a suffix of M, G, T, P, etc. for
-megabytes, gigabytes, terabytes, petabytes, etc.
+The capacity (size) specification can include a suffix of "N" (nodes),
+"K|KiB", "M|MiB", "G|GiB", "T|TiB", "P|PiB" (for powers of 1024) and "KB",
+"MB", "GB", "TB", "PB" (for powers of 1000). NOTE: Usually Slurm interprets
+KB, MB, GB, TB, PB, TB units as powers of 1024, but for Burst Buffers size
+specifications Slurm supports both IEC/SI formats. This is because the CRAY API
+for supports both formats.
 A sample command line follows and we also show the equivalent burst buffer
 script generated by the options:</p>
 <pre>
@@ -279,9 +287,12 @@ If no plugin is specified, the reservation applies to all configured burst
 buffer plugins.<br><br>
 <i>pool</i> specifies a Cray generic burst buffer resource pool.
 if "type" is not specified, the number is a measure of storage space.<br><br>
-<i>units</i> may be "N" (nodes), "M" (megabytes), "G" (gigabytes),
-"T" (terabytes), "P" (petabytes), etc. with the default units being bytes for
-reservations of storage space.<br><br>
+<i>units</i> may be "N" (nodes), "K|KiB", "M|MiB", "G|GiB", "T|TiB", "P|PiB"
+(for powers of 1024) and "KB", "MB", "GB", "TB", "PB" (for powers of 1000). The
+default units are bytes for reservations of storage space.
+NOTE: Usually Slurm interprets KB, MB, GB, TB, PB, TB units as powers of 1024,
+but for Burst Buffers size specifications Slurm supports both IEC/SI formats.
+This is because the CRAY API for supports both formats.<br><br>
 
 Jobs using this reservation are not restricted to these burst buffer resources,
 but may use these reserved resources plus any which are generally available.
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 4a43e0b287dc63dd24435ecd382e22088f512292..72793fe098e3603091fb1cf62e7b35ec3587e137 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -1390,15 +1390,18 @@ If no plugin is specified, the reservation applies to all configured burst
 buffer plugins.
 "type" specifies a Cray generic burst buffer resource, for example "nodes".
 if "type" is not specified, the number is a measure of storage space.
-The "units" may be "N" (nodes), "GB" (gigabytes), "TB" (terabytes),
-"PB" (petabytes), etc. with the default units being gigabytes for reservations
-of storage space.
+The "units" may be "N" (nodes), "K|KiB", "M|MiB", "G|GiB", "T|TiB", "P|PiB"
+(for powers of 1024) and "KB", "MB", "GB", "TB", "PB" (for powers of 1000).
+The default units are bytes for reservations of storage space.
 For example "BurstBuffer=cray:2TB" (reserve 2TB of storage plus
 3 nodes from the Cray plugin) or
 "BurstBuffer=100GB" (reserve 100 GB of storage from all configured burst buffer
 plugins).
 Jobs using this reservation are not restricted to these burst buffer resources,
 but may use these reserved resources plus any which are generally available.
+NOTE: Usually Slurm interprets KB, MB, GB, TB, PB, TB units as powers of 1024,
+but for Burst Buffers size specifications Slurm supports both IEC/SI formats.
+This is because the CRAY API for managing DataWarps supports both formats.
 
 .TP
 \fICoreCnt\fP=<num>