Skip to content

Commit 53d1795

Browse files
committed
Use index.md for introduction to YAML configuration
1 parent 8baa9eb commit 53d1795

File tree

8 files changed

+23
-24
lines changed

8 files changed

+23
-24
lines changed

doc/commands/build_command.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ All the following examples assume that:
937937
consequently, the project-level configuration will be determined by a
938938
`stack.yaml` file in the `global-project` directory in the
939939
[Stack root](../topics/stack_root.md) (for further information, see the
940-
[configuration](../configure/yaml/yaml_configuration.md) documentation); and
940+
[configuration](../configure/yaml/index.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/configure/environment_variables.md

Lines changed: 5 additions & 7 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 configuration](yaml/yaml_configuration.md) files (`config.yaml`).
91+
[global configuration](yaml/index.md) files (`config.yaml`).
9292

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

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

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

111110
Overridden by: Stack's global
112111
[`--stack-root`](global_flags.md#-stack-root-option) option.
@@ -131,8 +130,7 @@ the root directory of the project or package. The relative path cannot include a
131130
## `STACK_XDG`
132131

133132
Related command: all commands that make use of Stack's
134-
[user-specific global configuration](yaml/yaml_configuration.md) file
135-
(`config.yaml`).
133+
[user-specific global configuration](yaml/index.md) file (`config.yaml`).
136134

137135
Overridden by: the use of Stack's `STACK_ROOT` environment variable, or the use
138136
of Stack's global
@@ -145,7 +143,7 @@ set to any non-empty value.
145143
## `STACK_YAML`
146144

147145
Related command: all commands that make use of Stack's
148-
[project-level configuration](yaml/yaml_configuration.md).
146+
[project-level configuration](yaml/index.md).
149147

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

doc/configure/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Stack is configured by the content of files in the YAML formal. A global
2626
configuration file contains non-project specific options. A project-level
2727
configuration file contains project-specific options and may contain non-project
2828
specific options. For further information, see the
29-
[configuration](yaml/yaml_configuration.md) documentation.
29+
[configuration](yaml/index.md) documentation.
3030

3131
## Global flags and options
3232

doc/configure/yaml/yaml_configuration.md renamed to doc/configure/yaml/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
---
2+
title: Configuration files
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

3-
# Configuration
6+
# Configuration files
47

58
Stack is configured by the content of files in the [YAML](https://yaml.org/)
69
format.

doc/faq.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
project-level configuration file. This may be the file in the
9797
`global-project` directory in the [Stack root](topics/stack_root.md).
9898

99-
For further information, see the
100-
[configuration](configure/yaml/yaml_configuration.md) documentation.
99+
For further information, see the [configuration](configure/yaml/index.md)
100+
documentation.
101101

102102
??? question "How does Stack determine what GHC to use?"
103103

@@ -282,14 +282,13 @@
282282

283283
Add the package version to the [`extra-deps`](configure/yaml/project.md)
284284
project-specific configuration option in the
285-
[project-level configuration file](configure/yaml/yaml_configuration.md).
285+
[project-level configuration file](configure/yaml/index.md).
286286

287287
??? question "How do I use a package version not on Hackage?"
288288

289289
Add the location of the package version to the
290290
[`extra-deps`](configure/yaml/project.md) project-specific configuration
291-
option in the
292-
[project-level configuration file](configure/yaml/yaml_configuration.md).
291+
option in the [project-level configuration file](configure/yaml/index.md).
293292

294293
For further information, see the
295294
[package location](topics/package_location.md) documentation.
@@ -300,7 +299,7 @@
300299
Add the location of the package to the
301300
[`packages`](configure/yaml/project.md#packages) project-specific
302301
configuration option in the
303-
[project-level configuration file](configure/yaml/yaml_configuration.md).
302+
[project-level configuration file](configure/yaml/index.md).
304303

305304
One way to get the source code for the unmodified package version is to use
306305
the [`stack unpack`](commands/unpack_command.md).

doc/install_and_upgrade.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ To get and use Stack, some other things need to be in place first:
7575

7676
[^1]:
7777
About 3 GB for a single version of GHC and about 2 GB for a local copy
78-
of the Hackage package index.
79-
78+
of the Hackage package index.
79+
8080
*[platform]: Machine architecture (eg x86_64, AArch64) and operating system (eg Linux distribution, macOS, Windows).
8181

8282
- :material-wifi:{ .lg .middle } __Access to the Internet__
@@ -690,8 +690,7 @@ Stack can be installed directly or by using the GHCup tool.
690690
After installation, Stack will need to be configured before it can download
691691
large files consistently from within China (without reliance on a VPN).
692692
Please add the following to the bottom of the
693-
[global configuration file](configure/yaml/yaml_configuration.md)
694-
(`config.yaml`):
693+
[global configuration file](configure/yaml/index.md) (`config.yaml`):
695694

696695
~~~yaml
697696
###ADD THIS IF YOU LIVE IN CHINA

mkdocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ nav:
8888
- Configure:
8989
- configure/index.md
9090
- Environment variables: configure/environment_variables.md
91-
- Configuration:
92-
- Introduction: configure/yaml/yaml_configuration.md
91+
- Configuration files:
92+
- configure/yaml/index.md
9393
- Project-specific: configure/yaml/project.md
9494
- Non-project specific: configure/yaml/non-project.md
9595
- Global flags and options: configure/global_flags.md

stack.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.0
22

3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
3+
-- This file has been generated from package.yaml by hpack version 0.37.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -76,9 +76,9 @@ extra-source-files:
7676
doc/configure/environment_variables.md
7777
doc/configure/global_flags.md
7878
doc/configure/index.md
79+
doc/configure/yaml/index.md
7980
doc/configure/yaml/non-project.md
8081
doc/configure/yaml/project.md
81-
doc/configure/yaml/yaml_configuration.md
8282
doc/CONTRIBUTING.md
8383
doc/dev_containers.md
8484
doc/faq.md

0 commit comments

Comments
 (0)