Merge branch 'stable'

Author: mpilgrem

ChangeLog.md

@@ -214,10 +214,12 @@ Other enhancements:
 * In YAML configuration files, the `global-hints-location` key is introduced to
   allow the location of the global hints YAML specification file to be
   specified.
-* By default, Hpack 0.20.0 or later will decline to overwrite a Cabal file that
-  was modified manually. In YAML configuration files, the `hpack-force` key is
-  introduced to allow Hpack to overwrite such a Cabal file. The corresponding
-  `--hpack-force` flag is also added.
+* By default, Hpack 0.12.0 or later will decline to overwrite a Cabal file that
+  was created by a more recent version of Hpack and Hpack 0.20.0 or later will
+  decline to overwrite a Cabal file that was modified manually. In YAML
+  configuration files, the `hpack-force` key is introduced to allow Hpack to
+  overwrite such a Cabal file. The corresponding `--hpack-force` flag is also
+  added.
 * Add the `stack config set recommend-stack-upgrade` command to configure
   whether or not Stack should notify the user if it identifes a new version of
   Stack is available in YAML configuration files.

doc/configure/global_flags.md

@@ -131,9 +131,10 @@ for the same information.
 
 Default: Disabled
 
-By default, Hpack 0.20.0 or later will decline to overwrite a Cabal file that
-has been modified manually. Pass the flag `--hpack-force` to allow Hpack to
-overwrite such a Cabal file.
+By default, Hpack 0.12.0 or later will decline to overwrite a Cabal file that
+was created by a more recent version of Hpack and Hpack 0.20.0 or later will
+decline to overwrite a Cabal file that has been modified manually. Pass the flag
+`--hpack-force` to allow Hpack to overwrite such a Cabal file.
 
 ## `--hpack-numeric-version` flag
 

doc/configure/yaml/non-project.md

@@ -862,9 +862,11 @@ Default: `false`
 Command line equivalent (takes precedence):
 [`--hpack-force` option](../global_flags.md#-no-hpack-force-flag)
 
-Whether or not to allow Hpack to overwrite a Cabal file that has been modified
-manually. By default, Hpack 0.20.0 or later will decline to overwrite such a
-Cabal file.
+Whether or not to allow Hpack to overwrite a Cabal file that was created by a
+more recent version of Hpack or has been modified manually. By default,
+Hpack 0.12.0 or later will decline to overwrite a Cabal file that was created by
+a more recent version of Hpack and Hpack 0.20.0 or later will decline to
+overwrite a Cabal file that has been modified manually.
 
 ## ignore-revision-mismatch