about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2017-02-24 13:22:51 +0100
committerGitHub <noreply@github.com>2017-02-24 13:22:51 +0100
commit246b1db3ec6f2cfc1a5b645f6b709c700864a640 (patch)
tree0046c9436e491bb807b3f1533901b13582d3e1a9
parent9f082d21113a51221d6ee17ff81215e4b325a7be (diff)
parent8685adb26b0ec6a0b4fad2cb7765fae3b9f2e25c (diff)
downloadrust-246b1db3ec6f2cfc1a5b645f6b709c700864a640.tar.gz
rust-246b1db3ec6f2cfc1a5b645f6b709c700864a640.zip
Rollup merge of #39777 - mina86:gib, r=steveklabnik
book: binary prefixed are defined by IEC and not in SI

Binary prefixes (such as Gi for ‘gibi-’ in GiB) are defined by
International Electrotechnical Commission (IEC) and not in the
International System of Units (SI).

Though to be honest I’d just reword the previous paragraph to use ‘1 GiB’.
-rw-r--r--src/doc/book/src/the-stack-and-the-heap.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/book/src/the-stack-and-the-heap.md b/src/doc/book/src/the-stack-and-the-heap.md
index b9b3b801eae..6866505df13 100644
--- a/src/doc/book/src/the-stack-and-the-heap.md
+++ b/src/doc/book/src/the-stack-and-the-heap.md
@@ -86,7 +86,7 @@ to a large number, representing how much RAM your computer has. For example, if
 you have a gigabyte of RAM, your addresses go from `0` to `1,073,741,823`. That
 number comes from 2<sup>30</sup>, the number of bytes in a gigabyte. [^gigabyte]
 
-[^gigabyte]: ‘Gigabyte’ can mean two things: 10^9, or 2^30. The SI standard resolved this by stating that ‘gigabyte’ is 10^9, and ‘gibibyte’ is 2^30. However, very few people use this terminology, and rely on context to differentiate. We follow in that tradition here.
+[^gigabyte]: ‘Gigabyte’ can mean two things: 10<sup>9</sup>, or 2<sup>30</sup>. The IEC standard resolved this by stating that ‘gigabyte’ is 10<sup>9</sup>, and ‘gibibyte’ is 2<sup>30</sup>. However, very few people use this terminology, and rely on context to differentiate. We follow in that tradition here.
 
 This memory is kind of like a giant array: addresses start at zero and go
 up to the final number. So here’s a diagram of our first stack frame: