summaryrefslogtreecommitdiff
path: root/docs/users_guide
diff options
context:
space:
mode:
Diffstat (limited to 'docs/users_guide')
-rw-r--r--docs/users_guide/editing-guide.rst2
-rw-r--r--docs/users_guide/flags.py2
-rw-r--r--docs/users_guide/glasgow_exts.rst2
-rw-r--r--docs/users_guide/profiling.rst2
-rw-r--r--docs/users_guide/runtime_control.rst2
-rw-r--r--docs/users_guide/using-optimisation.rst2
-rw-r--r--docs/users_guide/using-warnings.rst2
7 files changed, 7 insertions, 7 deletions
diff --git a/docs/users_guide/editing-guide.rst b/docs/users_guide/editing-guide.rst
index d7888b494b..4d6c22dcc8 100644
--- a/docs/users_guide/editing-guide.rst
+++ b/docs/users_guide/editing-guide.rst
@@ -12,7 +12,7 @@ a rich but light-weight mark-up language aimed at producing documentation. The
`Sphinx <http://sphinx-doc.org/>`__ tool is used to produce the final PDF and
HTML documentation.
-This document (also written in ReST) serves as a brief introducion to ReST and to
+This document (also written in ReST) serves as a brief introduction to ReST and to
document the conventions used in the User's Guide. This document is *not* intended
to be a thorough guide to ReST. For this see the resources referenced
`below <#references>`__.
diff --git a/docs/users_guide/flags.py b/docs/users_guide/flags.py
index dcc6743d18..fb4592a2b2 100644
--- a/docs/users_guide/flags.py
+++ b/docs/users_guide/flags.py
@@ -33,7 +33,7 @@
#
# :extension:`extension`
#
-# Language exensions can be listed:
+# Language extensions can be listed:
#
# .. extension-print::
# :type: table/list/summary (REQUIRED)
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 5034d012a1..dcc43f9623 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1325,7 +1325,7 @@ like this ::
pure = return
x <*> y = do f <- x; a <- y; return (f a)
-will result in an infinte loop when ``<*>`` is called.
+will result in an infinite loop when ``<*>`` is called.
Just as you wouldn't define a ``Monad`` instance using the do-notation, you
shouldn't define ``Functor`` or ``Applicative`` instance using do-notation (when
diff --git a/docs/users_guide/profiling.rst b/docs/users_guide/profiling.rst
index c1d4d7d442..127944eb09 100644
--- a/docs/users_guide/profiling.rst
+++ b/docs/users_guide/profiling.rst
@@ -536,7 +536,7 @@ has the following properties,
The profile tree itself
Each entry in ``cost_centres`` is an object describing a cost-centre of the
-program having the following properies,
+program having the following properties,
``id`` (integral number)
A unique identifier used to refer to the cost-centre
diff --git a/docs/users_guide/runtime_control.rst b/docs/users_guide/runtime_control.rst
index 0b9cdfbfbc..dac4be6f7d 100644
--- a/docs/users_guide/runtime_control.rst
+++ b/docs/users_guide/runtime_control.rst
@@ -247,7 +247,7 @@ Miscellaneous RTS options
catch unhandled exceptions using the Windows exception handling mechanism.
This option is primarily useful for when you are using the Haskell code as a
DLL, and don't want the RTS to ungracefully terminate your application on
- erros such as segfaults.
+ errors such as segfaults.
.. rts-flag:: --generate-crash-dumps
diff --git a/docs/users_guide/using-optimisation.rst b/docs/users_guide/using-optimisation.rst
index 758bae39e0..4ca47524a7 100644
--- a/docs/users_guide/using-optimisation.rst
+++ b/docs/users_guide/using-optimisation.rst
@@ -383,7 +383,7 @@ by saying ``-fno-wombat``.
a shared-memory
multiprocessor <http://community.haskell.org/~simonmar/papers/multiproc.pdf>`__.
- See :ref:`parallel-compile-options` for a dicussion on its use.
+ See :ref:`parallel-compile-options` for a discussion on its use.
.. ghc-flag:: -fexcess-precision
:shortdesc: Enable excess intermediate precision
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 4649f86de0..137ca9c637 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -1733,7 +1733,7 @@ of ``-W(no-)*``.
The option :ghc-flag:`-Wunused-packages` warns about packages, specified on
command line via :ghc-flag:`-package ⟨pkg⟩` or
- :ghc-flag:`-package-id ⟨unit-id⟩`, but were not loaded during compication.
+ :ghc-flag:`-package-id ⟨unit-id⟩`, but were not loaded during compilation.
Usually it means that you have an unused dependency.
You may want to enable this warning on a clean build or enable :ghc-flag:`-fforce-recomp`