summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-03-19 16:59:16 +0000
committerIan Lynagh <igloo@earth.li>2009-03-19 16:59:16 +0000
commit26cc6e39618cb081c024750476590476e20b0138 (patch)
treead209bdfe124a4209b5b8991cdd1a7101dc9d063 /distrib
parent5cdb1ff5e889d3361e80e7b01bcb90b682dd9136 (diff)
downloadhaskell-26cc6e39618cb081c024750476590476e20b0138.tar.gz
Some wording wibbles from Thorkil
Diffstat (limited to 'distrib')
-rw-r--r--distrib/MacOS/GHC-system.pmdoc/index.xml6
-rw-r--r--distrib/MacOS/installer-docs/license.html4
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/MacOS/GHC-system.pmdoc/index.xml b/distrib/MacOS/GHC-system.pmdoc/index.xml
index 7182161ee3..ed248f3d75 100644
--- a/distrib/MacOS/GHC-system.pmdoc/index.xml
+++ b/distrib/MacOS/GHC-system.pmdoc/index.xml
@@ -5,7 +5,7 @@
\f0\fs26 \cf0 The installer will guide you through the process of installing the Glasgow Haskell Compiler (GHC) framework.\
\
-This package must be installed on the system volume and is not relocatable. An admin password is required during installation.\
+This package will be installed on the system volume and is not relocatable. An admin password is required during installation.\
\
*** IMPORTANT NOTE ***\
\
@@ -18,11 +18,11 @@ Xcode can be installed off your Mac OS X installation DVD or be downloaded from
\f0\fs26 \cf0 To start the Glasgow Haskell Compiler interactively, invoke the command 'ghci' in a Terminal window.\
\
-A user's guide and detailed library documentation is at\
+A user's guide and detailed library documentation is available by opening\
\
/usr/share/doc/ghc/index.html\
\
-More documentation is available online at\
+in a web browser. More documentation is available online at\
\
http://haskell.org/haskellwiki/GHC\
\
diff --git a/distrib/MacOS/installer-docs/license.html b/distrib/MacOS/installer-docs/license.html
index cd24367676..1c778db4a6 100644
--- a/distrib/MacOS/installer-docs/license.html
+++ b/distrib/MacOS/installer-docs/license.html
@@ -7,7 +7,7 @@
<h1>The Glasgow Haskell Compilation System License</h1>
<p>
The Glasgow Haskell Compilation System (GHC) is a bundle of software
-components covered by three different licences as detailed below.
+components covered by three different licenses as detailed below.
</p>
<ul>
<li><a href="#compiler">Compiler, runtime system, supporting infrastructure,
@@ -18,7 +18,7 @@ components covered by three different licences as detailed below.
</ul>
<p>
Note that by default the GMP will be statically linked into any binary
-produced by GHC. Software with a non-GPL compatible licence will have to
+produced by GHC. Software with a non-GPL compatible license will have to
ensure that the conditions of the LGPL are met; for example, by forcing GMP to
link dynamically instead.
</p>