diff options
author | Brian Wignall <brianwignall@gmail.com> | 2019-11-26 08:26:41 -0500 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-28 02:54:52 -0500 |
commit | 3748ba3a01f81078025b86023833784055d1af57 (patch) | |
tree | f5df08b667ac13c9dc28160aee08fec1a216a0bd /docs | |
parent | 5f84b52a9c439ae2739bf1899a2adbae9c6d4f67 (diff) | |
download | haskell-3748ba3a01f81078025b86023833784055d1af57.tar.gz |
Fix typos, using Wikipedia list of common typos
Diffstat (limited to 'docs')
-rw-r--r-- | docs/coding-style.html | 2 | ||||
-rwxr-xr-x | docs/opt-coercion/fc-normalization-rta.tex | 2 | ||||
-rw-r--r-- | docs/rts/rts.tex | 4 | ||||
-rw-r--r-- | docs/users_guide/ghci.rst | 2 | ||||
-rw-r--r-- | docs/users_guide/glasgow_exts.rst | 4 | ||||
-rw-r--r-- | docs/users_guide/safe_haskell.rst | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/docs/coding-style.html b/docs/coding-style.html index dbf0f8729a..c94913eac8 100644 --- a/docs/coding-style.html +++ b/docs/coding-style.html @@ -332,7 +332,7 @@ can be "polymorphic" as these examples show: Inline functions should be "static inline" because: <ul> <li> -gcc will delete static inlines if not used or theyre always inlined. +gcc will delete static inlines if not used or they're always inlined. <li> if they're externed, we could get conflicts between 2 copies of the diff --git a/docs/opt-coercion/fc-normalization-rta.tex b/docs/opt-coercion/fc-normalization-rta.tex index a1e7d4201d..c3bf41bd81 100755 --- a/docs/opt-coercion/fc-normalization-rta.tex +++ b/docs/opt-coercion/fc-normalization-rta.tex @@ -802,7 +802,7 @@ $$ \gamma ; \sym{\gamma} & \rsa{} & \refl{\tau} & \text{if}\,\gamma : \tau \psim \phi \end{array} $$ -But ther are much more complicated rewrites to consider. +But there are much more complicated rewrites to consider. Consider these coercions, where $C_N$ is the axiom generated by the newtype coercion in Section~\ref{sec:newtype}: $$ diff --git a/docs/rts/rts.tex b/docs/rts/rts.tex index bd54824707..d5d4f6d67d 100644 --- a/docs/rts/rts.tex +++ b/docs/rts/rts.tex @@ -640,7 +640,7 @@ only requires one argument so it leaves the second argument as a until @f@ calls @g@ which requires two arguments: the argument passed to it by @f@ and the pending argument which was passed to @f@. -Unboxed pending arguments are always preceeded by a ``tag'' which says +Unboxed pending arguments are always preceded by a ``tag'' which says how large the argument is. This allows the garbage collector to locate pointers within the stack. @@ -3250,7 +3250,7 @@ entered a @AP@ by switching worlds, entering the @AP@, pushing the arguments and function onto the stack, and entering the function which, likely as not, will be a byte-code object which we will enter by \emph{returning} to the byte-code interpreter. To avoid such -gratuitious world switching, we choose to recognise certain closure +gratuitous world switching, we choose to recognise certain closure types as being ``standard'' --- and duplicate the entry code for the ``standard closures'' in the bytecode interpreter. diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst index e5e5c37402..35a49766b4 100644 --- a/docs/users_guide/ghci.rst +++ b/docs/users_guide/ghci.rst @@ -2387,7 +2387,7 @@ commonly used commands. Attempting to redefine an existing command name results in an error unless the ``:def!`` form is used, in which case the old command with that name is silently overwritten. However for builtin commands - the old command can still be used by preceeding the command name with + the old command can still be used by preceding the command name with a double colon (eg ``::load``). It's not possible to redefine the commands ``:{``, ``:}`` and ``:!``. diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst index d23681e0b3..7ba170845a 100644 --- a/docs/users_guide/glasgow_exts.rst +++ b/docs/users_guide/glasgow_exts.rst @@ -6956,7 +6956,7 @@ like this: client to deliberately override an instance from a library, without requiring a change to the library.) -- If all the remaining candidates are incoherent, the search suceeds, returning +- If all the remaining candidates are incoherent, the search succeeds, returning an arbitrary surviving candidate. - If more than one non-incoherent candidate remains, the search fails. @@ -8784,7 +8784,7 @@ injectivity of a type family: 5. In a *closed type family* all equations are ordered and in one place. Equations are also checked pair-wise but this time an equation has to - be paired with all the preceeding equations. Of course a + be paired with all the preceding equations. Of course a single-equation closed type family is trivially injective (unless (1), (2) or (3) above holds). diff --git a/docs/users_guide/safe_haskell.rst b/docs/users_guide/safe_haskell.rst index b95364531f..edfedda4b2 100644 --- a/docs/users_guide/safe_haskell.rst +++ b/docs/users_guide/safe_haskell.rst @@ -788,7 +788,7 @@ And five warning flags: .. index:: single: safe haskell imports, warning - The module ``A`` below is annotated to be explictly ``Safe``, but it imports + The module ``A`` below is annotated to be explicitly ``Safe``, but it imports ``Safe-Inferred`` module. :: {-# LANGUAGE Safe #-} |