diff options
author | Martin Wright <martin@mynameismartin.com> | 2014-06-24 09:48:51 +0100 |
---|---|---|
committer | Martin Wright <martin@mynameismartin.com> | 2014-06-24 09:48:51 +0100 |
commit | f4b3d9e1e37707ca2a321f40572ad76f08445c96 (patch) | |
tree | 93fc30d029f0ede38d1ab5a5e45615cd1c4587c9 /docs/installing/macos.md | |
parent | d250dcaaae04a27b5f42f3a54a907189a358b71d (diff) | |
parent | 3d64a802326b5a8a193df95e7af3705214605a9f (diff) |
conflict: kept changes from gh-pages branch
Diffstat (limited to 'docs/installing/macos.md')
-rw-r--r-- | docs/installing/macos.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installing/macos.md b/docs/installing/macos.md index 181057fda..c46bdf4ba 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -11,7 +11,7 @@ title: Installing on MacOS X help. </p> -Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing). +Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing/). ## MacOS X 10.7 @@ -25,7 +25,7 @@ If you are using OS X Lion, download *Command Line Tools for Xcode* from [Apple] **Note:** As of Xcode 4.2, a non-LLVM version of GCC is no longer included. Homebrew has dealt with it by [switching to Clang](https://github.com/mxcl/homebrew/issues/6852). However, you may encounter errors installing RVM. *Please report these on the [mailing list](https://groups.google.com/group/alaveteli-dev).* The following instructions have been tested with Xcode 4.1. If necessary, you can install GCC from Xcode 4.1 by running: - brew install http://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb + brew install https://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb ## Homebrew |