Merge branch 'stable'

Author: mpilgrem

doc/script_command.md

@@ -13,11 +13,11 @@ The `stack script` command either runs a specified Haskell source file (using
 GHC's `runghc`) or, optionally, compiles such a file (using GHC) and, by
 default, runs it.
 
-Unlike [`stack ghc`](ghc_command.md) and [`stack runghc`](runghc_command.md),
-the command ignores any project-level configuration file (`stack.yaml`, by
-default) (including in the `global-project` directory in the Stack root). A
-snapshot must be specified on the command line (with the `--snapshot` option).
-For example:
+Unlike the [`stack ghc`](ghc_command.md) and [`stack runghc`](runghc_command.md)
+commands, the command ignores any project-level configuration file
+(`stack.yaml`, by default) (including in the `global-project` directory in the
+Stack root). Consequently, a snapshot must be specified on the command line
+(with the `--snapshot` option). For example:
 
 ~~~text
 stack script --snapshot lts-22.21 MyScript.hs
@@ -26,8 +26,8 @@ stack script --snapshot lts-22.21 MyScript.hs
 !!! info
 
     Non-project level configuration options in global configuration files
-    (`config.yaml`), are not ignored. Such options may be useful if
-    [`allow-newer`](yaml_configuration.md#allow-newer) and/or
+    (`config.yaml`), are not ignored by the `stack script` command. Such options
+    may be useful if [`allow-newer`](yaml_configuration.md#allow-newer) and/or
     [`allow-newer-deps`](yaml_configuration.md#allow-newer-deps) are required.
 
 The `stack script` command behaves as if the `--install-ghc` flag had been

doc/scripts.md

@@ -170,20 +170,24 @@ providing a comma or space separated list. For example:
 
 ## Stack configuration for scripts
 
-As with using [`stack script`](script_command.md) at the command line, any
-project-level configuration file (`stack.yaml`, by default) (including in the
-`global-project` directory in the Stack root) is ignored.
+When using the [`stack script`](script_command.md) command, as when using it at
+the command line, any project-level configuration file (`stack.yaml`, by
+default) (including in the `global-project` directory in the Stack root),
+including any specified by the options to the `stack script` command itself, is
+ignored.
 
 !!! info
 
     Non-project level configuration options in global configuration files
-    (`config.yaml`), are not ignored.
-
-With the [`stack runghc`](runghc_command.md) command, if the current working
-directory is inside a project then that project's Stack project-level
-configuration file is effective when running the script. Otherwise the script
-uses the project-level configuration file in the `global-project` directory of
-the Stack root.
+    (`config.yaml`), are not ignored by the [`stack script`](script_command.md)
+    command. Such options may be useful if
+    [`allow-newer`](yaml_configuration.md#allow-newer) and/or
+    [`allow-newer-deps`](yaml_configuration.md#allow-newer-deps) are required.
+
+When using the  [`stack runghc`](runghc_command.md) command, as when using it at
+the command line, if the current working directory is inside a project, then
+that project's project-level configuration file is effective when running the script. Otherwise the script uses the project-level configuration file in the
+`global-project` directory in the Stack root.
 
 ## Testing scripts