Merge remote-tracking branch 'upstream/pull/1726'

[rails.git] / INSTALL.md

diff --git a/INSTALL.md b/INSTALL.md
index d036673b1ee1923bdffcdb8dfc36ab7cbd5cde15..7571cff50fd7c7eb6d3b79e4f59f713aefb794ed 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio
 
 Installing PostgreSQL:
 
 
 Installing PostgreSQL:
 

-* Install Postgres.app from http://postgresapp.com/
+* Install Postgres.app from https://postgresapp.com/

 * Add PostgreSQL to your path, by editing your profile:
 
 `nano ~/.profile`
 * Add PostgreSQL to your path, by editing your profile:
 
 `nano ~/.profile`


@@ -80,9 +80,11 @@ and adding:
 
 Installing other dependencies:
 
 
 Installing other dependencies:
 

-* Install Homebrew from http://mxcl.github.io/homebrew/
+* Install Homebrew from https://brew.sh/

 * Install the latest version of Ruby: `brew install ruby`
 * Install ImageMagick: `brew install imagemagick`
 * Install the latest version of Ruby: `brew install ruby`
 * Install ImageMagick: `brew install imagemagick`

+* Install libxml2: `brew install libxml2 --with-xml2-config`
+* If you want to run the tests, you need `phantomjs` as well: `brew install phantomjs`

 * Install Bundler: `gem install bundler`
 
 Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml.
 * Install Bundler: `gem install bundler`
 
 Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml.