Merge branch 'stable'

Author: mpilgrem

doc/README.md

@@ -21,7 +21,7 @@ Stack features:
 ## How to install Stack
 
 Stack can be installed on most Unix-like operating systems (including macOS) and
-on Windows.
+Windows.
 
 === "Unix-like"
 
@@ -62,10 +62,15 @@ on Windows.
     For other operating systems and direct downloads, see the
     [install and upgrade guide](install_and_upgrade.md).
 
+!!! info
+
+    Stack can also be installed using the separate
+    [GHCup](https://www.haskell.org/ghcup/) installer for Haskell-related tools.
+
 ## How to upgrade Stack
 
-If you already have Stack installed, you can upgrade it to the latest version
-by the command:
+If Stack is already installed, you can upgrade it to the latest version by the
+command:
 
 ~~~text
 stack upgrade
@@ -151,14 +156,16 @@ The Haskell source code for the executable (application) is in file `Main.hs`.
 
 The executable uses a library. Its source code is in file `Lib.hs`.
 
-The contents of `my-project.cabal` describes the project. That file is generated
-by the contents of `package.yaml`.
+The contents of `my-project.cabal` describes the project's package. That file is
+generated by the contents of `package.yaml`.
 
 !!! info
 
     If you want, you can delete the `package.yaml` file and update the
     `my-project.cabal` file directly. Stack will then use that file.
 
+The contents of `stack.yaml` describe Stack's own project-level configuration.
+
 You can edit the source files in the `src` directory (used for the library) or
 the `app` directory (used for the executable (application)).