Merge branch 'master' into wip/binary-readerTwip/binary-readerT

7 files changed, 8 insertions, 8 deletions

diff --git a/utils/gen-dll/Main.hs b/utils/gen-dll/Main.hs
index 39f8ed9c13..237a43016e 100644
--- a/utils/gen-dll/Main.hs
+++ b/utils/gen-dll/Main.hs
@@ -152,7 +152,7 @@ ar = AR_TOOL_BIN
 -- dll is 2^16-1, however Microsoft's lib.exe for some reason refuses to link
 -- up to this amount. The reason is likely that it adds some extra symbols in
 -- the generated dll, such as dllmain etc. So we reserve some space in the
--- symbol table to accomodate this. This number is just purely randomly chosen.
+-- symbol table to accommodate this. This number is just purely randomly chosen.
 #define SYMBOL_PADDING 10
 
 usage :: IO ()
diff --git a/utils/genapply/Main.hs b/utils/genapply/Main.hs
index 8c194f1ca0..a6d944efa4 100644
--- a/utils/genapply/Main.hs
+++ b/utils/genapply/Main.hs
@@ -38,7 +38,7 @@ import System.IO
 import Control.Arrow ((***))
 
 -- -----------------------------------------------------------------------------
--- Argument kinds (rougly equivalent to PrimRep)
+-- Argument kinds (roughly equivalent to PrimRep)
 
 data ArgRep
   = N   -- non-ptr
diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index 3427a1ebae..ef8e284593 100644
--- a/utils/genprimopcode/Main.hs
+++ b/utils/genprimopcode/Main.hs
@@ -427,7 +427,7 @@ wrapOp :: String -> String
 wrapOp nm | isAlpha (head nm) = nm
           | otherwise         = "(" ++ nm ++ ")"
 
--- | Turn an identifer or operator into its infix form
+-- | Turn an identifier or operator into its infix form
 asInfix :: String -> String
 asInfix nm | isAlpha (head nm) = "`" ++ nm ++ "`"
            | otherwise         = nm
@@ -857,7 +857,7 @@ ppType (TyApp (TyCon "ByteArray#")  []) = "byteArrayPrimTy"
 ppType (TyApp (TyCon "RealWorld")   []) = "realWorldTy"
 ppType (TyApp (TyCon "ThreadId#")   []) = "threadIdPrimTy"
 ppType (TyApp (TyCon "ForeignObj#") []) = "foreignObjPrimTy"
-ppType (TyApp (TyCon "BCO#")        []) = "bcoPrimTy"
+ppType (TyApp (TyCon "BCO")         []) = "bcoPrimTy"
 ppType (TyApp (TyCon "Compact#")    []) = "compactPrimTy"
 ppType (TyApp (TyCon "()")          []) = "unitTy"      -- unitTy is TysWiredIn's name for ()
 
diff --git a/utils/haddock b/utils/haddock
-Subproject 1a685b213c6a1a1f2ea86826891eda1acbfecc8
+Subproject e91c892a2532ff6abc6d7639db6bad66278b1c0
diff --git a/utils/hpc/HpcMarkup.hs b/utils/hpc/HpcMarkup.hs
index 70519600e9..e44fa7b95f 100644
--- a/utils/hpc/HpcMarkup.hs
+++ b/utils/hpc/HpcMarkup.hs
@@ -477,7 +477,7 @@ instance Monoid ModuleSummary where
   mappend = (<>)
 
 ------------------------------------------------------------------------------
--- global color pallete
+-- global color palette
 
 red,green,yellow :: String
 red    = "#f20913"
diff --git a/utils/lndir/lndir-Xos.h b/utils/lndir/lndir-Xos.h
index b423f6b641..6421d4a0bf 100644
--- a/utils/lndir/lndir-Xos.h
+++ b/utils/lndir/lndir-Xos.h
@@ -18,7 +18,7 @@
  */
 
 /* This is a collection of things to try and minimize system dependencies
- * in a "signficant" number of source files.
+ * in a "significant" number of source files.
  */
 
 #pragma once
diff --git a/utils/unlit/unlit.c b/utils/unlit/unlit.c
index 97f853b268..5a0e535109 100644
--- a/utils/unlit/unlit.c
+++ b/utils/unlit/unlit.c
@@ -20,7 +20,7 @@
  * 1) Empty script files are not permitted.  A file in which no lines
  *    begin with `>' usually indicates a file in which the programmer
  *    has forgotten about the literate script convention.
- * 2) A line containing part of program definition (i.e. preceeded by `>')
+ * 2) A line containing part of program definition (i.e. preceded by `>')
  *    cannot be used immediately before or after a comment line unless
  *    the comment line is blank.  This error usually indicates that
  *    the `>' character has been omitted from a line in a section of
@@ -166,7 +166,7 @@ static int egetc(FILE *istream)
  * Lines of type DEFN are copied to the output stream `ostream'
  * (without the leading DEFNCHAR).  BLANK and TEXT lines are
  * replaced by empty (i.e. blank lines) in the output stream, so
- * that error messages refering to line numbers in the output file
+ * that error messages referring to line numbers in the output file
  * can also be used to locate the corresponding line in the input
  * stream.
  */