Skip to content

Commit 81317e9

Browse files
committed
Improve YAML configuration files in glossary
1 parent a2bb295 commit 81317e9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/glossary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The following terms are used in Stack's documentation.
1111
|Cabal (the tool)|The Haskell build tool provided by the [`cabal-install` package](https://hackage.haskell.org/package/cabal-install).|
1212
|CI |Continuous integration. |
1313
|CMake |A [system](https://cmake.org/) for managing build processes.|
14-
|`config.yaml` |A non-project-specific configuration file used by Stack. |
14+
|`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.|
1717
|extra-deps |Packages in addition to those in a snapshot, named after a key used in `stack.yaml` files.|
@@ -43,7 +43,7 @@ The following terms are used in Stack's documentation.
4343
|`Setup.hs` |A project-specific file used by Cabal to perform setup tasks.|
4444
|snapshot |A snapshot defines a GHC version, a set of packages, and build flags or other settings.|
4545
|Stack |The Haskell Tool Stack project or its executable `stack`. |
46-
|`stack.yaml` |A project-specific configuration file used by Stack. |
46+
|`stack.yaml` |A project-level configuration file used by Stack, which may also contain non-project-specific options.|
4747
|Stackage |A [distribution](https://www.stackage.org/) of compatible Haskell packages.|
4848
|Stack root |A directory in which Stack stores important files. See `stack path --stack-root`. On Windows, Stack also stores important files outside of the Stack root.|
4949
|Unix-like operating systems|Linux, FreeBSD and macOS. |

0 commit comments

Comments
 (0)