Merge remote-tracking branch 'origin/stable'

Author: borsboom

doc/GUIDE.md

@@ -1425,7 +1425,7 @@ modified version of a dependency that hasn't yet been released upstream.
 
 Please note that when adding upstream packages directly to your project it is
 important to distinguish _local packages_ from the upstream _dependency
-packages_. Otherwise you may have trouble running `stack GHCi`. See
+packages_. Otherwise you may have trouble running `stack ghci`. See
 [stack.yaml documentation](yaml_configuration.md#packages) for more details.
 
 ## Flags and GHC options

doc/install_and_upgrade.md

@@ -82,7 +82,7 @@ Run:
 
 ### Using Homebrew
 
-If you have a popular [brew](http://brew.sh/) tool installed, you can just do:
+If you have the popular [brew](https://brew.sh/) tool installed, you can just do:
 
     brew install haskell-stack
 
@@ -91,7 +91,7 @@ but tend to be updated within a day or two.
 * Normally, Homebrew will install from a pre-built binary (aka "pour from a
 bottle"), but if `brew` starts trying to build everything from source (which
 will take hours), see
-[their FAQ on the topic](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md#why-do-you-compile-everything).
+[their FAQ on the topic](https://github.com/Homebrew/brew/blob/master/docs/FAQ.md#why-do-you-compile-everything).
 
 ### Notes