From 6cd563b139f9b9b0bd385cd8e4d47a990ef2affd Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 24 Mar 2019 18:24:55 +0000 Subject: [PATCH 1/2] Stop pointing to futurice now macOS is supported --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41fddcc..0a2e4b7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ It follows the unix UNIX philosophy of [do one thing and do it well](https://en. Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [pyenv](https://github.com/pyenv/pyenv) and [jenv](http://www.jenv.be). -*OS X users may prefer [futurice](https://haskell.futurice.com/) and Ubuntu users may prefer [hvr's ppa](https://launchpad.net/~hvr/+archive/ubuntu/ghc).* +*Ubuntu users may prefer [hvr's ppa](https://launchpad.net/~hvr/+archive/ubuntu/ghc).* *This project was started when [CM](https://github.com/capital-match) was switching from stack to [cabal nix-style builds](https://www.haskell.org/cabal/users-guide/nix-local-build-overview.html).* From 66c63f349d3125aa305ded271cdc8446c0fa0bc8 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 24 Mar 2019 18:26:46 +0000 Subject: [PATCH 2/2] Prefer "macOS" over "Mac OS X" (Apple rebranded Mac OS X to OS X in 2012, and then to macOS in 2016.) --- README.md | 2 +- www/index.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0a2e4b7..9805134 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/haskell/ghcup.svg?branch=master)](https://travis-ci.org/haskell/ghcup) [![license](https://img.shields.io/github/license/haskell/ghcup.svg)](COPYING) -`ghcup` makes it easy to install specific versions of `ghc` on GNU/Linux as well as MacOS (aka Darwin), and can also bootstrap a fresh Haskell developer environment from scratch. +`ghcup` makes it easy to install specific versions of `ghc` on GNU/Linux as well as macOS (aka Darwin), and can also bootstrap a fresh Haskell developer environment from scratch. It follows the unix UNIX philosophy of [do one thing and do it well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well). Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [pyenv](https://github.com/pyenv/pyenv) and [jenv](http://www.jenv.be). diff --git a/www/index.html b/www/index.html index b4e62d1..6e92f49 100644 --- a/www/index.html +++ b/www/index.html @@ -33,7 +33,7 @@