Consistently use extra-dep, as defined in the glossary

Author: mpilgrem

Diff for: ChangeLog.md

@@ -255,7 +255,7 @@ Bug fixes:
 Hackage-only release of the `stack` package:
 
 * Supports building against snapshot Stackage LTS Haskell 21.0 (GHC 9.4.5),
-  without extra deps.
+  without extra-deps.
 * Supports build with `persistent-2.14.5.0`, using CPP directives.
 * Supports build with `unix-compat-0.7`, by removing reliance on the module
   `System.PosixCompat.User` removed in that package.
@@ -1626,7 +1626,7 @@ Bug fixes:
 * `stack script` can now handle relative paths to source files.
   See [#3372](https://github.com/commercialhaskell/stack/issues/3372).
 * Fixes explanation of why a target is needed by the build plan, when the
-  target is an extra dependency from the commandline.
+  target is an extra-dep from the commandline.
   See [#3378](https://github.com/commercialhaskell/stack/issues/3378).
 * Previously, if you delete a yaml file from ~/.stack/build-plan, it would
   trust the etag and not re-download.  Fixed in this version.
@@ -2456,8 +2456,8 @@ Major changes:
     * Overall it should now be able to initialize almost all existing Cabal
       packages out of the box as long as the package itself is consistently
       defined.
-    * Choose the best possible snapshot and add extra dependencies on top
-      of a snapshot resolver rather than a compiler resolver -
+    * Choose the best possible snapshot and add extra-deps on top
+      of a snapshot other than a compiler snapshot -
       [#1583](https://github.com/commercialhaskell/stack/pull/1583)
     * Automatically omit a package (`--omit-packages`) when it is compiler
       incompatible or when there are packages with conflicting dependency
@@ -2924,7 +2924,7 @@ Bug fixes:
 
 * Hacky workaround for optparse-applicative issue with `stack exec --help`
   [#806](https://github.com/commercialhaskell/stack/issues/806)
-* Build executables for local extra deps
+* Build executables for local extra-deps
   [#920](https://github.com/commercialhaskell/stack/issues/920)
 * copyFile can't handle directories
   [#942](https://github.com/commercialhaskell/stack/pull/942)

Diff for: doc/GUIDE.md

@@ -1337,7 +1337,7 @@ followed by the module name.
 !!! note
 
     If you have added packages to your project please make sure to mark them as
-    extra deps for faster and reliable usage of `stack ghci`. Otherwise GHCi may
+    extra-deps for faster and reliable usage of `stack ghci`. Otherwise GHCi may
     have trouble due to conflicts of compilation flags or having to
     unnecessarily interpret too many modules. See Stack's project-level
     [configuration](yaml_configuration.md#extra-deps) to learn how to

Diff for: doc/build_command.md

@@ -76,9 +76,9 @@ supported syntaxes for targets are:
 
 *   *package*, e.g. `stack build foobar`, is the most commonly used target. It
     will try to find the package in the following locations: project packages,
-    extra deps, snapshots, and package index (e.g. Hackage). If it's found in
-    the package index, then the latest version of that package from the index is
-    implicitly added to your extra dependencies.
+    extra-deps, the snapshot, and the package index (e.g. Hackage). If it's
+    found in the package index, then the latest version of that package from the
+    index is implicitly added as an extra-dep.
 
     If the package is a project package, the library and executable components
     are selected to be built. If the `--test` and `--bench` flags are set, then

Diff for: doc/glossary.md

@@ -15,7 +15,7 @@ The following terms are used in Stack's documentation.
 |dependency         |A Haskell package other than a project package and on which a project package depends (directly or indirectly), located locally or elsewhere.|
 |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_.|
 |Emacs              |[GNU Emacs](https://www.gnu.org/software/emacs/), an extensible, customisable text editor.|
-|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.|
+|extra-deps         |Extra dependencies (one version of each) that add to, or shadow, those specified in a snapshot.|
 |FreeBSD            |A Unix-like operating system.                             |
 |GCC                |The [GNU Compiler Collection](https://gcc.gnu.org/) or its executable `gcc`.|
 |GHC                |The [Glasgow Haskell Compiler](https://www.haskell.org/ghc/).|

Diff for: doc/lock_files.md

@@ -103,7 +103,7 @@ common case of no changes.
 
 The lock file contains the following information:
 
-* Completed package locations for extra deps and packages in snapshot files
+* Completed package locations for extra-deps and packages in snapshot files
 
     !!! note
 

Diff for: doc/script_command.md

@@ -138,17 +138,17 @@ LTS Haskell 20.25, where considerations on Windows differ from non-Windows. The
     ~~~
 
     `acme-missiles` is not in the snapshot and so needs to be specified as an
-    extra dep.
+    extra-dep.
 
     Stack can deduce that the module imports imply that the required packages
     are `acme-missiles`, `time` and `extra` (which is in the snapshot).
 
     `extra` depends on `directory` and `process`. If `directory` and `process`
-    are not specified as extra deps, Stack will complain that they have been
+    are not specified as extra-deps, Stack will complain that they have been
     'pruned'.
 
     `directory-1.3.6.2` depends on `time < 1.12`. If `time` is not specified as
-    an extra dep, Stack will try to construct a build plan based on the latest
+    an extra-dep, Stack will try to construct a build plan based on the latest
     version in the package index (which will fail, as the latest version is
     `>= 1.12`)
 
@@ -168,7 +168,7 @@ LTS Haskell 20.25, where considerations on Windows differ from non-Windows. The
     ~~~
 
     `acme-missiles` is not in the snapshot and so needs to be specified as an
-    extra dep.
+    extra-dep.
 
     Stack can deduce that the module imports imply that the required packages
     are `acme-missiles`, `time` and `extra` (which is in the snapshot).

Diff for: doc/stack_yaml_vs_cabal_package_file.md

@@ -50,14 +50,14 @@ Stack defines a new concept called a _project_. A project has:
 * And a bunch more Stack configuration
 
 Often you will have a project that defines only one local Cabal package that you
-are working on. If you need to specify an extra dependency, a source of
-confusion can be why you need to specify it both in the `stack.yaml` file _and_
+are working on. If you need to specify a dependency, a source of confusion can
+be why you need to specify it both in the `stack.yaml` file _and_
 in the Cabal file. To explain, let's take a quick detour to talk about snapshots
 and how Stack resolves dependencies.
 
 ## Snapshots and resolvers
 
-Stack follows a rule that says, for any projects, there is precisely one version
+Stack follows a rule that says, for any project, there is precisely one version
 of each package available. Obviously, for many packages there are _many_
 versions available in the world. But when resolving a `stack.yaml` file, Stack
 requires that you have chosen a specific version for each package available.