Skip to content

Commit 8baa9eb

Browse files
committed
Simplify references to configuration files.
1 parent 1f31a1f commit 8baa9eb

21 files changed

+106
-99
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ The `pedantic` job runs on `ubuntu` only and builds Stack with the
548548
`--pedantic` flag.
549549

550550
The `unit-tests` job runs on a matrix of operating systems and Stack
551-
project-level YAML configuration files (`stack.yaml`, by default). It builds and
551+
project-level configuration files (`stack.yaml`, by default). It builds and
552552
tests Stack with the following flags: `--haddock --no-haddock-deps`.
553553

554554
Its approach to creating a cache depends on the operating system. Its 'Cache

doc/commands/build_command.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -647,26 +647,27 @@ The effect of `--fast` can be overriden with Stack's
647647
options are used during the configure step of the Cabal build process; see
648648
Stack's
649649
[`configure-options`](../configure/yaml/non-project.md#configure-options)
650-
YAML configuration option.
650+
non-project specific configuration option.
651651

652652
### `--ghc-options` option
653653

654654
GHC command line options can be specified for a package in its Cabal file
655655
(including one created from a `package.yaml` file). This option augments and, if
656656
applicable (see below), overrides any such GHC command line options and those
657-
specified in Stack's YAML configuration files - see the
658-
[`ghc-options`](../configure/yaml/non-project.md#ghc-options) configuration
659-
option.
657+
specified in Stack's configuration files - see the
658+
[`ghc-options`](../configure/yaml/non-project.md#ghc-options) non-project
659+
specific configuration option.
660660

661661
`stack build --ghc-options <ghc_options>` passes the specified command line
662662
options to GHC, depending on Stack's
663-
[`apply-ghc-options`](../configure/yaml/non-project.md#apply-ghc-options) YAML
664-
configuration option. This option can be specified multiple times.
663+
[`apply-ghc-options`](../configure/yaml/non-project.md#apply-ghc-options)
664+
non-project specific configuration option. This option can be specified multiple
665+
times.
665666

666667
GHC's command line options are _order-dependent_ and evaluated from left to
667668
right. Later options can override the effect of earlier ones. Any GHC command
668669
line options for a package specified at Stack's command line are applied after
669-
those specified in Stack's YAML configuration files.
670+
those specified in Stack's configuration files.
670671

671672
### `--[no-]library-profiling` flag
672673

@@ -880,9 +881,9 @@ package is targetted in a multi-package project (for example, using
880881
contents of the log files to the standard error output stream of the console
881882
at the end of the build, use Stack's `dump-logs` option. For further
882883
information about that option, see the
883-
[YAML configuration](../configure/yaml/non-project.md#dump-logs)
884-
documentation. The default `dump-logs` mode is to output the contents of any
885-
log files that include GHC warnings.
884+
[`dump-logs](../configure/yaml/non-project.md#dump-logs) non-project
885+
specific configuration option documentation. The default `dump-logs` mode is
886+
to output the contents of any log files that include GHC warnings.
886887

887888
### `--[no]-open` flag
888889

@@ -936,8 +937,7 @@ All the following examples assume that:
936937
consequently, the project-level configuration will be determined by a
937938
`stack.yaml` file in the `global-project` directory in the
938939
[Stack root](../topics/stack_root.md) (for further information, see the
939-
[YAML configuration](../configure/yaml/yaml_configuration.md)
940-
documentation); and
940+
[configuration](../configure/yaml/yaml_configuration.md) documentation); and
941941

942942
* if `stack build` is commanded in a project directory, there is a
943943
`stack.yaml` file in that directory.

doc/commands/config_command.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stack config COMMAND
77
88
Available commands:
99
env Print environment variables for use in a shell
10-
set Sets a key in YAML configuration file to value
10+
set Sets a key in configuration file to value
1111
~~~
1212

1313
The `stack config` commands provide assistance with accessing or modifying
@@ -55,8 +55,8 @@ Available commands:
5555
installation or not.
5656
~~~
5757

58-
The `stack config set` commands allow the values of keys in YAML configuration
59-
files to be set. See `stack config set` for the available keys.
58+
The `stack config set` commands allow the values of keys in configuration files
59+
to be set. See `stack config set` for the available keys.
6060

6161
!!! note
6262

@@ -69,10 +69,12 @@ files to be set. See `stack config set` for the available keys.
6969
stack config set install-ghc [--global] true|false
7070
~~~
7171

72-
`stack config set install-ghc true` or `false` sets the `install-ghc` key in a
73-
YAML configuration file, accordingly. By default, the project-level
74-
configuration file (`stack.yaml`, by default) is altered. The `--global` flag
75-
specifies the user-specific global configuration file (`config.yaml`).
72+
`stack config set install-ghc true` or `false` sets the
73+
[`install-ghc`](../configure/yaml/non-project.md#install-ghc) non-project
74+
specific configuration option in a configuration file, accordingly. By default,
75+
the project-level configuration file (`stack.yaml`, by default) is altered. The
76+
`--global` flag specifies the user-specific global configuration file
77+
(`config.yaml`).
7678

7779
## The `stack config set package-index download-prefix` command
7880

@@ -83,10 +85,12 @@ stack config set package-index download-prefix [--global] [URL]
8385
~~~
8486

8587
`stack config set package-index download-prefix <url>` sets the
86-
`download-prefix` key of the `package-index` key in a YAML configuration file,
87-
accordingly. By default, the project-level configuration file (`stack.yaml`, by
88-
default) is altered. The `--global` flag specifies the user-specific global
89-
configuration file (`config.yaml`).
88+
`download-prefix` key of the
89+
[`package-index`](../configure/yaml/non-project.md#package-index) non-project
90+
specific configuration option in a configuration file, accordingly. By default,
91+
the project-level configuration file (`stack.yaml`, by default) is altered. The
92+
`--global` flag specifies the user-specific global configuration file
93+
(`config.yaml`).
9094

9195
## The `stack config set resolver` command
9296

@@ -130,7 +134,9 @@ Known bug:
130134
stack config set system-ghc [--global] true|false
131135
~~~
132136

133-
`stack config set system-ghc true` or `false` sets the `system-ghc` key in a
134-
YAML configuration file, accordingly. By default, the project-level
135-
configuration file (`stack.yaml`, by default) is altered. The `--global` flag
136-
specifies the user-specific global configuration file (`config.yaml`).
137+
`stack config set system-ghc true` or `false` sets the
138+
[`system-ghc`](../configure/yaml/non-project.md#system-ghc) non-project
139+
specific configuration option in a configuration file, accordingly. By default,
140+
the project-level configuration file (`stack.yaml`, by default) is altered. The
141+
`--global` flag specifies the user-specific global configuration file
142+
(`config.yaml`).

doc/commands/init_command.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
stack init [DIR(S)] [--omit-packages] [--force] [--ignore-subdirs]
77
~~~
88

9-
`stack init` initialises Stack's default project-level YAML configuration file
9+
`stack init` initialises Stack's default project-level configuration file
1010
(`stack.yaml`) for an existing project, based on the Cabal file or
1111
`package.yaml` file for each of its packages.
1212

doc/commands/ls_command.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ example of the applied style. The latter can be disabled with flags `--no-sgr`
211211
and `--no-example`.
212212

213213
The flag `--basic` specifies a more basic report, in the format that is accepted
214-
by Stack's command line option `--stack-colors` and the YAML configuration key
215-
`stack-colors`.
214+
by Stack's command line option `--stack-colors` and the
215+
[`stack-colors`](../configure/yaml/non-project.md#stack-colors) non-project
216+
specific configuration option.
216217

217218
## The `stack ls tools` command
218219

doc/commands/path_command.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ Pass the following flags for information about specific files or locations:
2222
|--compiler-bin |The directory containing the GHC executable. |
2323
|--compiler-exe |The GHC executable. |
2424
|--compiler-tools-bin |The directory containing binaries specific to a particular compiler.|
25-
|--config-location |Stack's project-level YAML configuration file (`stack.yaml`, by default).|
25+
|--config-location |Stack's project-level configuration file (`stack.yaml`, by default).|
2626
|--dist-dir |The dist work directory, relative to the package directory.|
2727
|--extra-include-dirs |Extra include directories. |
2828
|--extra-library-dirs |Extra library directories. |
2929
|--ghc-package-path |The `GHC_PACKAGE_PATH` environment variable. |
30-
|--global-config |Stack's user-specific global YAML configuration file (`config.yaml`).|
30+
|--global-config |Stack's user-specific global configuration file (`config.yaml`).|
3131
|--global-pkg-db |The global package database. |
3232
|--local-bin |The directory in which Stack installs executables. |
3333
|--local-doc-root |The root directory for local project documentation. |

doc/commands/sdist_command.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ available modes for use with Cabal file revisions are `lower-revision`,
2727
`upper-revision` and `both-revision`.
2828

2929
For futher information, see the
30-
[YAML configuration](../configure/yaml/non-project.md#pvp-bounds) documentation.
30+
[`pvp-bounds`](../configure/yaml/non-project.md#pvp-bounds) non-project specific
31+
configuration option documentation.
3132

3233
## `--tar-dir` option
3334

doc/commands/setup_command.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ By default:
2323
Pass the option `--ghc-bindist <url>` to specify the URL of the GHC to be
2424
downloaded and installed. This option requires the use of the `--ghc-variant`
2525
option specifying a custom GHC variant. For further information about the
26-
`--ghc-variant` option, see the see the
27-
[YAML configuration](../configure/yaml/non-project.md#ghc-variant)
28-
documentation.
26+
`--ghc-variant` option, see the
27+
[`ghc-variant`](../configure/yaml/non-project.md#ghc-variant) non-project
28+
specific configuration option documentation.
2929

3030
If Stack is configured not to install GHC (`install-ghc: false` or passing the
3131
`--no-install-ghc` flag) then `stack setup` will warn that the flag and the

doc/commands/upload_command.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ available modes for use with Cabal file revisions are `lower-revision`,
5454
`upper-revision` and `both-revision`.
5555

5656
For futher information, see the
57-
[YAML configuration](../configure/yaml/non-project.md#pvp-bounds) documentation.
57+
[`pvp-bounds`](../configure/yaml/non-project.md#pvp-bounds) non-project
58+
specific configuration option documentation.
5859

5960
The `--tar-dir <path_to_directory>` option determines whether the package
6061
archive should be copied to the specified directory.

doc/configure/environment_variables.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,24 @@ sequences for color to its output.
8888
## `STACK_CONFIG`
8989

9090
Related command: all commands that make use of Stack's
91-
[global YAML configuration files](yaml/yaml_configuration.md) (`config.yaml`).
91+
[global configuration](yaml/yaml_configuration.md) files (`config.yaml`).
9292

9393
The environment variable `STACK_CONFIG` can be used to specify an absolute path
94-
to the user-specific global YAML configuration file, overriding the default.
94+
to the user-specific global configuration file, overriding the default.
9595

9696
## `STACK_GLOBAL_CONFIG`
9797

9898
Related command: all commands that make use of Stack's
99-
[global YAML configuration files](yaml/yaml_configuration.md) (`config.yaml`).
99+
[global configuration](yaml/yaml_configuration.md) files (`config.yaml`).
100100

101101
The environment variable `STACK_GLOBAL_CONFIG` can be used to specify an
102-
absolute path to the system-wide global YAML configuration file, overriding the
102+
absolute path to the system-wide global configuration file, overriding the
103103
default.
104104

105105
## `STACK_ROOT`
106106

107107
Related command: all commands that make use of Stack's
108-
[user-specific global YAML configuration file](yaml/yaml_configuration.md)
108+
[user-specific global configuration](yaml/yaml_configuration.md) file
109109
(`config.yaml`).
110110

111111
Overridden by: Stack's global
@@ -131,7 +131,7 @@ the root directory of the project or package. The relative path cannot include a
131131
## `STACK_XDG`
132132

133133
Related command: all commands that make use of Stack's
134-
[user-specific global YAML configuration file](yaml/yaml_configuration.md)
134+
[user-specific global configuration](yaml/yaml_configuration.md) file
135135
(`config.yaml`).
136136

137137
Overridden by: the use of Stack's `STACK_ROOT` environment variable, or the use
@@ -145,10 +145,10 @@ set to any non-empty value.
145145
## `STACK_YAML`
146146

147147
Related command: all commands that make use of Stack's
148-
[project-level YAML configuration file](yaml/yaml_configuration.md).
148+
[project-level configuration](yaml/yaml_configuration.md).
149149

150150
Overridden by: Stack's global
151151
[`--stack-yaml`](global_flags.md#-stack-yaml-option) option.
152152

153153
The environment variable `STACK_YAML` can be used to specify Stack's
154-
project-level YAML configuration file.
154+
project-level configuration file.

0 commit comments

Comments
 (0)