Merge branch 'stable'

doc/commands/upgrade_command.md

@@ -36,15 +36,16 @@ By default:
   local binary directory (see `stack path --local-bin`) and named `stack`
   (replacing any existing executable named `stack` there);
 
-* if the current running Stack executable is named `stack` (or, on Windows,
-  `stack.exe`) (this is case insensitive), an existing binary distribution will
-  replace it. If the executable is located outside of Stack's local binary
-  directory, pass the `--only-local-bin` flag to skip that step;
+* if the current running Stack executable is '`stack`' (that is, it was invoked
+  as `stack` or, on Windows, `stack.exe` - this is case insensitive), an
+  existing binary distribution will replace it. If the executable is located
+  outside of Stack's local binary directory, pass the `--only-local-bin` flag to
+  skip that step;
 
-* if the current running Stack executable is named other than `stack` (and, on
-  Windows, `stack.exe`), an existing binary distribution will only be put in
-  Stack's local binary directory and named `stack`. Pass the
-  `--no-only-local-bin` flag to replace also the current running executable;
+* if the current running Stack executable is not '`stack`' (as described above),
+  an existing binary distribution will only be put in Stack's local binary
+  directory and named `stack`. Pass the `--no-only-local-bin` flag to replace
+  also the current running executable;
 
 * the new version will be the latest available. Pass the
   `--binary-version <version>` option to specify the version (this implies
@@ -85,9 +86,9 @@ When compiling from source code, by default:
 * `stack upgrade --force-download` seeks an upgrade to the latest version of
   Stack available as a binary distribution for the platform, even if not newer.
 
-* If the Stack executable is named `my-stack`, `my-stack upgrade` seeks only to
-  put the latest version of Stack available as a binary distribution for the
-  platform, if newer, in Stack's local binary directory and name it `stack`.
+* If the Stack executable is invoked as `my-stack`, `my-stack upgrade` seeks
+  only to put the latest version of Stack available as a binary distribution for
+  the platform, if newer, in Stack's local binary directory and name it `stack`.
   `my-stack upgrade --no-only-local-bin` seeks also to upgrade `my-stack` to the
   latest version of Stack available.
 

doc/tutorial/building_your_project.md

@@ -270,8 +270,22 @@ towards by default as well).
 As mentioned, a snapshot specifies a version of GHC as well as a set of package
 versions.
 
-Let's try using an older LTS snapshot. We'll use the Stackage LTS Haskell 21.25
-snapshot with the command:
+??? question "I want to use a particular version of GHC. What snapshot should I use?"
+
+    For each supported version of GHC, the Stackage
+    [homepage](https://www.stackage.org/) lists the most recent Stackage
+    snapshot. In most cases, that is the snapshot you should use.
+
+??? question "Can I use a snapshot like `ghc-9.6.6`?"
+
+    Snapshot `ghc-9.6.6` specifies GHC 9.6.6 and, consequently, the GHC boot
+    packages that come with that compiler. However, the snapshot does not
+    include the many other package versions that will work with that compiler.
+    For a set of those package versions, see the snapshots published by the
+    [Stackage](https://www.stackage.org/) project.
+
+Let us try using an older Stackage LTS Haskell snapshot. We will use the LTS
+21.25 snapshot with the command:
 
 ~~~text
 stack --snapshot lts-21.25 build