From: Ian Lynagh Date: Thu, 19 Mar 2009 16:59:16 +0000 (+0000) Subject: Some wording wibbles from Thorkil X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=26cc6e39618cb081c024750476590476e20b0138;p=ghc-hetmet.git Some wording wibbles from Thorkil --- diff --git a/distrib/MacOS/GHC-system.pmdoc/index.xml b/distrib/MacOS/GHC-system.pmdoc/index.xml index 7182161..ed248f3 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 cd24367..1c778db 100644 --- a/distrib/MacOS/installer-docs/license.html +++ b/distrib/MacOS/installer-docs/license.html @@ -7,7 +7,7 @@

The Glasgow Haskell Compilation System License

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.

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.