Skip to content

Commit 490d2f0

Browse files
committed
Merge branch 'stable'
2 parents 9f3948f + 3be5be0 commit 490d2f0

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

doc/glossary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The following terms are used in Stack's documentation.
1414
|`config.yaml` |A global and non-project-specific configuration file used by Stack.|
1515
|Docker |A [platform](https://www.docker.com/) for developing, shipping, and running applications. It can package and run an application in a loosely isolated environment called a _container_.|
1616
|Emacs |[GNU Emacs](https://www.gnu.org/software/emacs/), an extensible, customisable text editor.|
17-
|extra-deps |Packages in addition to those in a snapshot, named after a key used in `stack.yaml` files.|
17+
|extra-deps |Packages (one version of each) that add to, or amend, those specified in a snapshot. Named after a key used in `stack.yaml` files.|
1818
|FreeBSD |A Unix-like operating system. |
1919
|GCC |The [GNU Compiler Collection](https://gcc.gnu.org/) or its executable `gcc`.|
2020
|GHC |The [Glasgow Haskell Compiler](https://www.haskell.org/ghc/).|
@@ -43,7 +43,7 @@ The following terms are used in Stack's documentation.
4343
|REPL |An interactive (run-eval-print loop) programming environment.|
4444
|resolver |A synonym for snapshot. |
4545
|`Setup.hs` |A project-specific file used by Cabal to perform setup tasks.|
46-
|snapshot |A snapshot defines a GHC version, a set of packages, and build flags or other settings.|
46+
|snapshot |A snapshot defines a GHC version, a set of packages (one version of each), and build flags or other settings.|
4747
|Stack |The Haskell Tool Stack project or its executable `stack`. |
4848
|`stack.yaml` |A project-level configuration file used by Stack, which may also contain non-project-specific options.|
4949
|Stackage |A [distribution](https://www.stackage.org/) of compatible Haskell packages.|

doc/yaml_configuration.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ Stack's YAML configuration options break down into
1313
configured at the project-level or globally.
1414

1515
The **project-level** configuration file (`stack.yaml`) contains
16-
project-specific options and may contain non-project-specific options.
16+
project-specific options and may contain non-project-specific options. However,
17+
non-project-specific options in the project-level configuration file in the
18+
`global-project` directory (see below) are ignored by Stack.
1719

1820
Stack obtains project-level configuration from one of the following (in order of
1921
preference):
@@ -301,8 +303,10 @@ TODO: Add a simple example of how to use custom preprocessors.
301303

302304
## Non-project-specific configuration
303305

304-
Non-project configuration options are valid in a project-level configuration
305-
file (`stack.yaml`) or in global configuration files (`config.yaml`). The
306+
Non-project configuration options can be included in a project-level
307+
configuration file (`stack.yaml`) or in global configuration files
308+
(`config.yaml`). However, non-project-specific options in the project-level
309+
configuration file in the `global-project` directory are ignored by Stack. The
306310
options below are listed in alphabetic order.
307311

308312
### allow-different-user

0 commit comments

Comments
 (0)