Merge branch 'stable'

doc/faq.md

@@ -424,7 +424,7 @@
     is as follows:
 
     * In the Cabal file, the following
-      [`ld-options`](https://cabal.readthedocs.io/en/stable/cabal-package.html#pkg-field-ld-options)
+      [`ld-options`](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html#pkg-field-ld-options)
       are set: `-static` and `-pthread`.
 
     * The Stack command is run in a Docker container based on Alpine Linux. The

doc/glossary.md

@@ -7,7 +7,7 @@ The following terms are used in Stack's documentation.
 |Term               |Meaning                                                   |
 |-------------------|----------------------------------------------------------|
 |Cabal              |The Haskell Common Architecture for Building Applications and Libraries, provided by the [`Cabal` package](https://hackage.haskell.org/package/Cabal). Also referred to as Cabal (the library) to distinguish it from Cabal (the tool).|
-|Cabal file|A file containing a [package description](https://cabal.readthedocs.io/en/stable/cabal-package.html) used by Cabal, named `<package_name>.cabal`.|
+|Cabal file|A file containing a [package description](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html) used by Cabal, named `<package_name>.cabal`.|
 |Cabal (the tool)|The Haskell tool used for building provided by the [`cabal-install` package](https://hackage.haskell.org/package/cabal-install).|
 |CI                 |Continuous integration.                                   |
 |CMake              |A [system](https://cmake.org/) for managing build processes.|

doc/tutorial/hello_world_example.md

@@ -387,7 +387,7 @@ functionality to create a Cabal file.
     those components depend.
 
     The
-    [Cabal User Guide](https://cabal.readthedocs.io/en/stable/cabal-package.html)
+    [Cabal User Guide](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html)
     is the definitive reference for the Cabal package description format.
 
     The [Hpack](https://github.com/sol/hpack#quick-reference) documentation

mkdocs.yml

@@ -165,7 +165,9 @@ plugins:
   search: {}
   redirects:
     redirect_maps:
+      'GUIDE.md': 'tutorial/index.md'
       'yaml_configuration.md': 'configure/yaml/index.md'
       'build_command.md': 'commands/build_command.md'
       'custom_snapshot.md': 'topics/custom_snapshot.md'
       'lock_files.md': 'topics/lock_files.md'
+      'scripts.md': 'topics/scripts.md'