Merge branch 'stable'

Author: mpilgrem

doc/GUIDE_advanced.md

@@ -72,9 +72,9 @@ of any `STACK_WORK` environment variable.
 
 ## The `stack build` command
 
-The `stack build` command is introduced in the first part of
-[Stack's user guide](GUIDE.md#the-stack-build-command). For further information
-about the command, see the [build command](build_command.md) documentation.
+The `stack build` command is introduced in the first part of Stack's
+[user's guide](GUIDE.md#the-stack-build-command). For further information about
+the command, see the [build command](build_command.md) documentation.
 
 ## The `stack config` commands
 

doc/README.md

@@ -148,12 +148,12 @@ To manage your library:
    file, in its `extra-deps:` section.
 
 That was a really fast introduction on how to start to code in Haskell using
-Stack. If you want to go further, we highly recommend you read the
-[Stack User Guide](GUIDE.md).
+Stack. If you want to go further, we highly recommend you read Stack's
+[user's guide](GUIDE.md).
 
 ## Complete guide to Stack
 
-A complete [user guide to Stack](GUIDE.md) is available, covering all of
+A complete [user's guide](GUIDE.md) to Stack is available, covering all of
 the most common ways to use Stack. Terms used in Stack's documentation are also
 explained in the [glossary](glossary.md).
 

doc/build_command.md

@@ -8,9 +8,9 @@ The primary command you use in Stack is `build`. This page describes the `build`
 command's interface. The goal of the interface is to do the right thing for
 simple input, and allow a lot of flexibility for more complicated goals.
 
-See the introductory part of
-[Stack's user guide](GUIDE.md#the-stack-build-command) for an introduction to
-the command.
+See the introductory part of Stack's
+[user's guide](GUIDE.md#the-stack-build-command) for an introduction to the
+command.
 
 ## Synonyms
 
@@ -119,7 +119,7 @@ To get a list of the available targets in your project, use `stack ide targets`.
 ## Controlling what gets built
 
 Stack will automatically build the necessary dependencies. See the introductory
-part of [Stack's user guide](GUIDE.md#the-stack-build-command) for information
+part of Stack's [user's guide](GUIDE.md#the-stack-build-command) for information
 about how these dependencies get specified.
 
 In addition to specifying targets, you can also control what gets built, or

doc/faq.md

@@ -10,8 +10,8 @@ here is to be as helpful and concise as possible.
 
 The version of GHC, as well as which packages can be installed, are specified by
 the _resolver_. This may be something like `lts-19.19`, which is from
-[Stackage](https://www.stackage.org/). The [user guide](GUIDE.md) discusses the
-resolver in more detail.
+[Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses
+the resolver in more detail.
 
 The resolver is determined by finding the relevant project-level configuration
 file (`stack.yaml`) for the directory you're running the command from. This

mkdocs.yml

@@ -19,8 +19,8 @@ nav:
 - Changelog: ChangeLog.md
 - Tool documentation:
   - Install/upgrade: install_and_upgrade.md
-  - User guide (introductory): GUIDE.md
-  - User guide (advanced): GUIDE_advanced.md
+  - User's guide (introductory): GUIDE.md
+  - User's guide (advanced): GUIDE_advanced.md
   - FAQ: faq.md
   - Configuration (project and global): yaml_configuration.md
   - stack.yaml vs a Cabal file: stack_yaml_vs_cabal_package_file.md
@@ -42,15 +42,15 @@ nav:
 - Advanced documentation:
   - Build overview: build_overview.md
 - Project documentation:
-  - Contributors guide: CONTRIBUTING.md
-  - Maintainer guide:
-    - Releases: maintainers/releases.md
-    - Maintainer team process: maintainers/team_process.md
-    - Add GHC version: maintainers/ghc.md
-    - Docker images: maintainers/docker.md
-    - Upgrading MSYS2: maintainers/msys.md
-    - HaskellStack.org: maintainers/haskellstack.org.md
-  - Signing key: SIGNING_KEY.md
+  - Contributor's guide: CONTRIBUTING.md
+- Maintainer's guide:
+  - Releases: maintainers/releases.md
+  - Maintainer team process: maintainers/team_process.md
+  - Add GHC version: maintainers/ghc.md
+  - Docker images: maintainers/docker.md
+  - Upgrading MSYS2: maintainers/msys.md
+  - HaskellStack.org: maintainers/haskellstack.org.md
+- Signing key: SIGNING_KEY.md
 - Glossary: glossary.md
 
 markdown_extensions: