Merge remote-tracking branch 'origin/stable'

Author: snoyberg

doc/install_and_upgrade.md

@@ -14,7 +14,7 @@ Distribution packages are available for [Ubuntu](#ubuntu), [Debian](#debian),
 [Fedora](#fedora),
 [Arch Linux](#arch-linux) and [FreeBSD](#freebsd).
 Binaries for other operating systems are listed below, and available on
-[the Github releases page](https://github.com/fpco/stack/releases). For the
+[the GitHub release page](https://github.com/fpco/stack/releases). For the
 future, we are open to supporting more OSes (to request one, please
 [submit an issue](https://github.com/commercialhaskell/stack/issues/new)).
 
@@ -175,7 +175,7 @@ install it by simply doing:
     sudo pacman -S stack
 
 Note that this version may slightly lag behind, but it should be updated within
-the day. The package is also always rebuilt and updated when one of it's
+the day. The package is also always rebuilt and updated when one of its
 dependencies gets an update.
 
   - [stack](https://www.archlinux.org/packages/community/x86_64/stack/) _latest stable version_

doc/yaml_configuration.md

@@ -164,11 +164,6 @@ does not rely on correct ordering in the package index, while revision
 number is likely simpler to use. In practice, both should guarantee
 equally reproducible build plans.
 
-If unspecified, `subdirs` defaults to `['.']` (i.e. look only in the top-level
-directory).  Note that if you specify a value of `subdirs`, then `'.'` is _not_
-included by default and needs to be explicitly specified if a required package
-is found in the top-level directory of the repository.
-
 #### Local file path
 
 Like `packages`, local file paths can be used in `extra-deps`, and
@@ -231,8 +226,11 @@ extra-deps:
   - wai
 ```
 
-If unspecified, `subdirs` defaults to `subdirs: [.]`, or looking for a
-package in the root of the repo.
+If unspecified, `subdirs` defaults to `['.']` meaning looking for a
+package in the root of the repo..  Note that if you specify a value of
+`subdirs`, then `'.'` is _not_ included by default and needs to be
+explicitly specified if a required package is found in the top-level
+directory of the repository.
 
 #### Archives (HTTP(S) or local filepath)