Skip to content

Commit 956a82d

Browse files
committed
Merge branch 'stable'
2 parents 7e700be + 61f7e3b commit 956a82d

File tree

9 files changed

+716
-555
lines changed

9 files changed

+716
-555
lines changed

doc/commands/build_command.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,8 @@ All the following examples assume that:
10281028
consequently, the project-level configuration will be determined by a
10291029
`stack.yaml` file in the `global-project` directory in the
10301030
[Stack root](../topics/stack_root.md) (for further information, see the
1031-
[YAML configuration](../configure/yaml_configuration.md) documentation); and
1031+
[YAML configuration](../configure/yaml/yaml_configuration.md)
1032+
documentation); and
10321033

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

doc/commands/index.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
---
2+
title: Commands
3+
---
14
<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
25

36
# Commands (advanced)
47

58
Some of Stack's features will not be needed regularly or by all users. This part
69
of the guide and the part on [configuration](../configure/index.md) provide
7-
information about somethose features, organised as a reference guide. Some of
8-
the features are complex and separate pages are dedicated to them.
10+
information about some of those features, organised as a reference guide. Some
11+
of the features are complex and separate pages are dedicated to them.
912

1013
## Stack commands (thematic)
1114

doc/configure/environment_variables.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ 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_configuration.md) (`config.yaml`).
91+
[global YAML configuration files](yaml/yaml_configuration.md) (`config.yaml`).
9292

9393
The environment variable `STACK_CONFIG` can be used to specify an absolute path
9494
to the user-specific global YAML 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_configuration.md) (`config.yaml`).
99+
[global YAML configuration files](yaml/yaml_configuration.md) (`config.yaml`).
100100

101101
The environment variable `STACK_GLOBAL_CONFIG` can be used to specify an
102102
absolute path to the system-wide global YAML configuration file, overriding the
@@ -105,7 +105,7 @@ default.
105105
## `STACK_ROOT`
106106

107107
Related command: all commands that make use of Stack's
108-
[user-specific global YAML configuration file](yaml_configuration.md)
108+
[user-specific global YAML configuration file](yaml/yaml_configuration.md)
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_configuration.md)
134+
[user-specific global YAML configuration file](yaml/yaml_configuration.md)
135135
(`config.yaml`).
136136

137137
Overridden by: the use of Stack's `STACK_ROOT` environment variable, or the use
@@ -145,7 +145,7 @@ 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_configuration.md).
148+
[project-level YAML configuration file](yaml/yaml_configuration.md).
149149

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

doc/configure/index.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
---
2+
Title: Configure
3+
---
14
<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
25

36
# Configuration (advanced)
47

58
Some of Stack's features will not be needed regularly or by all users. This part
6-
of the guide and the part on [Stack's commands](commands/index.md)
7-
provide information about those features, organised as a reference guide. Some
8-
of the features are complex and separate pages are dedicated to them.
9+
of the guide and the part on Stack's [commands](../commands/index.md) provide
10+
information about those features, organised as a reference guide. Some of the
11+
features are complex and separate pages are dedicated to them.
912

1013
The behaviour of Stack is configurable using environment variables, YAML
1114
configuration files, global flags and options on the command line and

0 commit comments

Comments
 (0)