--- on-disk-format.txt	2011-09-04 12:48:00.000000000 -0500
+++ on-disk-format.txt.patched	2011-09-04 13:05:28.000000000 -0500
@@ -167,7 +167,7 @@
 but can be changed exactly as described in the remarks above. A C reference
 implementation using SHA1 is available from [Fru05a].
 
-s p l i -m a t e r i a l = A F s p l i t ( u n s p l i t -m a t e r i a l , l e n g t h , s t r i p e s )
+s p l i t -m a t e r i a l = A F s p l i t ( u n s p l i t -m a t e r i a l , l e n g t h , s t r i p e s )
 u n s p l i t -m a t e r i a l = AFmerge ( s p l i t -m a t e r i a l , l e n g t h , s t r i p e s )
 
 Notice that the result of AFsplit, split-material, is stripes-times as large as
@@ -198,9 +198,9 @@
 
 3. THE PARTITION HEADER 5
 
-The input to H1(d), namely d, is partitioned into individual data junks.
-The partitioning repeataly takes a data vector with the size |P | as di with the
-finally block (possibly shorter than |P |) dn. The transformation happens as
+The input to H1(d), namely d, is partitioned into individual data hunks.
+The partitioning repeatedly takes a data vector with the size |P | as di with the
+final block (possibly shorter than |P |) dn. The transformation happens as
 follows:
 
 pi = P (i || di) (5)
@@ -318,7 +318,7 @@
 slot entries in the phdr. The information about the bulk data start is written
 into the payload-offset field of the phdr. These values will not change during
 the lifetime of a LUKS partition and are simply cached for safety reasons as a
-miscalculation of these values can cause data corruption (f.i. an incorrect start
+miscalculation of these values can cause data corruption (e.g. an incorrect start
 of the bulk data can overwrite key material, same is true in reverse).
 
 The master key is checksummed, so a correct master key can be detected.
@@ -383,14 +383,14 @@
 
 4. LUKS OPERATIONS 9
 4.2 Adding new passwords
-To add a password to a LUKS partition, one has to possess an unencrypted
-copy of the master key. Either this is, because the initialisation process is still
-in progress, or the user has supplied a correct password for an existing key slot,
-which master key could therefore be recovered. This operation is sketched in
+To add a password to a LUKS partition one has to possess an
+unencrypted copy of the master key; either initialization must still
+be in progress or the master key must be recovered using a valid
+password to an existing key slot.  The latter operation is sketched in
 Figure 4.
 
-Assuming we have a good copy of the master key in memory, the next step
-is to fetch a salt from a random source, and the choice of a password iteration
+Assuming we have a good copy of the master key in memory the next steps
+are to fetch a salt from a random source and to choose a password iteration
 count7. This information is written into a free - that is disabled - key slot of
 the phdr.
 
@@ -444,7 +444,7 @@
 
 ks . i t e r a t i o n -count = PBKDF2-I t e r a t i o n s P e r S e c o n d *
 
-i n t e nt e d P a s s w o r d C h e c k i n g T i m e ( i n s e c o n d s )
+i n t e n d e d P a s s w o r d C h e c k i n g T i m e ( i n s e c o n d s )
 
 ks . s a l t = g e n e r a t e random v e c t o r , l e n g t h : LUKS SALTSIZE